提交 ef2b8aeb 作者: 谭志磊

合并

......@@ -7,5 +7,5 @@ indent_style = space
end_of_line = lf
insert_final_newline = true
[**.yml]
[*.{yml,yaml}]
indent_size = 2
......@@ -36,3 +36,5 @@ out/
### VS Code ###
.vscode/
node_modules
logs/
......@@ -5,8 +5,8 @@
## 开发环境
<!-- prettier-ignore -->
- JDK 1.8+ (推荐同时安装最新 LTS 版本) [下载](https://www.oracle.com/java/technologies/downloads/#jdk17-windows)
- NodeJS [latest](https://nodejs.org/zh-cn/)
- JDK 17 [版本管理工具](https://github.com/shyiko/jabba)
- NodeJS [下载](https://nodejs.org/zh-cn/)
- IDEA [下载](https://www.jetbrains.com/idea/)
- Navicat Premium [下载](http://www.downcc.com/soft/430673.html)
- RedisDesktopManager [下载](https://github.com/FuckDoctors/rdm-builder)
......@@ -18,6 +18,7 @@
<!-- prettier-ignore -->
- [开发规范说明](./doc/workflow.md)
- [技术栈说明](./doc/technique.md)
- [实用技巧](./doc/skill.md)
---
......
dependencies {
implementation project(':basic-common:core')
implementation project(':basic-common:util')
implementation project(':basic-common:redis')
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-amqp'
// 本地依赖
implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
// hutool-core
implementation "cn.hutool:hutool-core:${hutoolVersion}"
// fastjson
implementation "com.alibaba:fastjson:${fastJsonVersion}"
// https://github.com/vladmihalcea/hibernate-types
// hibernate-types-55
implementation "com.vladmihalcea:hibernate-types-55:${hibernateTypesVersion}"
}
/**
* @author Jim
* @version 0.1
* 2022/4/14 14:53
*/
package com.yiring.app;
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.push.domain;
import com.alibaba.fastjson.JSON;
import com.vladmihalcea.hibernate.type.json.JsonType;
import com.yiring.common.domain.BasicEntity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Objects;
import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import lombok.experimental.SuperBuilder;
import org.hibernate.Hibernate;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.TypeDef;
/**
* 推送消息日志
*
* @author Jim
* @version 0.1
* 2022/4/14 14:55
*/
@Getter
@Setter
@ToString
@SuperBuilder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
@FieldDefaults(level = AccessLevel.PRIVATE)
@Entity
@TypeDef(name = "json", typeClass = JsonType.class)
@Table(
name = "SYS_PUSH_MESSAGE",
indexes = {
@Index(columnList = "type"),
@Index(columnList = "status"),
@Index(columnList = "source"),
@Index(columnList = "sourceId"),
@Index(columnList = "target"),
@Index(columnList = "targetId"),
@Index(columnList = "pushTime"),
}
)
@Comment("推送消息日志")
public class PushMessage extends BasicEntity implements Serializable {
@Serial
private static final long serialVersionUID = 1478640364892356248L;
@Comment("消息类型")
@Enumerated(EnumType.STRING)
Type type;
@Comment("消息来源")
String source;
@Comment("消息来源标识")
String sourceId;
@Comment("消息目标")
String target;
@Comment("消息目标标识")
String targetId;
@Comment("消息内容")
String content;
@Comment("扩展数据")
@org.hibernate.annotations.Type(type = "json")
@Column(columnDefinition = "json")
JSON extra;
@Comment("消息状态")
@Enumerated(EnumType.STRING)
Status status;
@Comment("推送反馈结果")
@org.hibernate.annotations.Type(type = "json")
@Column(columnDefinition = "json")
JSON result;
@Comment("重试次数")
Integer retryCount;
@Comment("推送时间")
LocalDateTime pushTime;
@SuppressWarnings({ "unused" })
public enum Type {
WS("STOMP WebSocket 消息"),
APP("APP 消息"),
SMS("短信消息"),
EMAIL("邮件消息"),
CALL_TTS("TTS 文本合成语音消息(电话)"),
CALL_AUDIO("自定义音频消息(电话)"),
DEVICE_TONE("自定义音频消息(音柱)");
final String text;
Type(String text) {
this.text = text;
}
public String text() {
return this.text;
}
public String queue() {
return String.format("push.%s.queue", this.name());
}
}
@SuppressWarnings({ "unused" })
public enum Status {
SUCCESS("成功"),
FAIL("失败");
final String text;
Status(String text) {
this.text = text;
}
public String text() {
return this.text;
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
PushMessage that = (PushMessage) o;
return getId() != null && Objects.equals(getId(), that.getId());
}
@Override
public int hashCode() {
return getClass().hashCode();
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.push.domain;
import java.io.Serializable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;
/**
* @author Jim
* @version 0.1
* 2022/4/14 15:33
*/
@Repository
public interface PushMessageRepository
extends JpaRepository<PushMessage, Serializable>, JpaSpecificationExecutor<PushMessage> {}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.push.rabbitmq;
import java.util.HashMap;
import java.util.Map;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
import org.springframework.amqp.core.Queue;
import org.springframework.amqp.core.TopicExchange;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* 推送 rabbitmq 配置
*
* @author ifzm
* 2019/8/21 15:44
*/
@Configuration
public class PushRabbitConfig {
public static final String PUSH_TOPIC_EXCHANGE = "push.topic.exchange";
public static final String PUSH_APP_QUEUE = "push.app.queue";
public static final String PUSH_WS_QUEUE = "push.ws.queue";
public static final String PUSH_SMS_QUEUE = "push.sms.queue";
public static final String PUSH_EMAIL_QUEUE = "push.email.queue";
public static final String PUSH_CALL_TTS_QUEUE = "push.call.tts.queue";
public static final String PUSH_CALL_AUDIO_QUEUE = "push.call.audio.queue";
public static final String PUSH_DEVICE_TONE_QUEUE = "push.device.tone.queue";
/**
* 订阅模式
*
* @return TopicExchange
*/
@Bean
TopicExchange exchange() {
return new TopicExchange(PUSH_TOPIC_EXCHANGE, true, false);
}
@Bean(PUSH_APP_QUEUE)
public Queue pushAppQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 60 * 1000);
return new Queue(PUSH_APP_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeApp(@Qualifier(PUSH_APP_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_APP_QUEUE);
}
@Bean(PUSH_WS_QUEUE)
public Queue pushWebSocketQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 30 * 1000);
return new Queue(PUSH_WS_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeWs(@Qualifier(PUSH_WS_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_WS_QUEUE);
}
@Bean(PUSH_SMS_QUEUE)
public Queue pushSmsQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 30 * 1000);
return new Queue(PUSH_SMS_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeSms(@Qualifier(PUSH_SMS_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_SMS_QUEUE);
}
@Bean(PUSH_EMAIL_QUEUE)
public Queue pushEmailQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 60 * 1000);
return new Queue(PUSH_EMAIL_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeEmail(@Qualifier(PUSH_EMAIL_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_EMAIL_QUEUE);
}
@Bean(PUSH_CALL_TTS_QUEUE)
public Queue pushCallTtsQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 60 * 10 * 1000);
return new Queue(PUSH_CALL_TTS_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeCallTts(@Qualifier(PUSH_CALL_TTS_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_CALL_TTS_QUEUE);
}
@Bean(PUSH_CALL_AUDIO_QUEUE)
public Queue pushCallAudioQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 60 * 10 * 1000);
return new Queue(PUSH_CALL_AUDIO_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeCallAudio(@Qualifier(PUSH_CALL_AUDIO_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_CALL_AUDIO_QUEUE);
}
@Bean(PUSH_DEVICE_TONE_QUEUE)
public Queue pushDeviceToneQueue() {
Map<String, Object> args = new HashMap<>(1);
args.put("x-message-ttl", 60 * 10 * 1000);
return new Queue(PUSH_DEVICE_TONE_QUEUE, true, false, false, args);
}
@Bean
Binding bindingExchangeDeviceTone(@Qualifier(PUSH_DEVICE_TONE_QUEUE) Queue queue, TopicExchange exchange) {
return BindingBuilder.bind(queue).to(exchange).with(PUSH_DEVICE_TONE_QUEUE);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.push.rabbitmq;
import com.yiring.app.push.domain.PushMessageRepository;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* rabbitmq配置
*
* @author ifzm
* 2019/8/21 16:07
*/
@SuppressWarnings({ "unused" })
@Slf4j
@Component("PushRabbitReceiver")
@Transactional(rollbackFor = Exception.class)
public class PushRabbitReceiver {
@Resource
PushMessageRepository repository;
@RabbitHandler
@RabbitListener(queues = PushRabbitConfig.PUSH_WS_QUEUE)
public void receiverWebSocketMessage(Long id) {
log.info("接收到消息: " + id);
repository.findById(id).ifPresent(message -> log.info("{}", message));
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.push.service;
import com.alibaba.fastjson.JSONObject;
import com.yiring.app.push.domain.PushMessage;
/**
* 推送服务
*
* @author Jim
* @version 0.1
* 2022/4/14 16:01
*/
public interface PushService {
void push(PushMessage.Type type, JSONObject raw);
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.push.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.yiring.app.push.domain.PushMessage;
import com.yiring.app.push.domain.PushMessageRepository;
import com.yiring.app.push.rabbitmq.PushRabbitConfig;
import com.yiring.app.push.service.PushService;
import javax.annotation.Resource;
import javax.transaction.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.stereotype.Service;
/**
* 推送服务实现
*
* @author Jim
* @version 0.1
* 2022/4/14 16:08
*/
@Slf4j
@Service
@Transactional(rollbackOn = Exception.class)
public class PushServiceImpl implements PushService {
@Resource
PushMessageRepository repository;
@Resource
AmqpTemplate amqpTemplate;
@Override
public void push(PushMessage.Type type, JSONObject raw) {
PushMessage message = new PushMessage();
message.setType(type);
message.setExtra(raw);
repository.saveAndFlush(message);
amqpTemplate.convertAndSend(PushRabbitConfig.PUSH_TOPIC_EXCHANGE, type.queue(), message.getId());
}
}
......@@ -7,10 +7,12 @@ bootJar {
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
implementation 'org.springframework.boot:spring-boot-starter-amqp'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation "org.springframework.boot:spring-boot-starter-websocket"
implementation "org.springframework.boot:spring-boot-starter-reactor-netty"
// 💬 Mock/Test Env
runtimeOnly 'com.h2database:h2'
// 💬 Prod/Dev Env
......@@ -20,13 +22,19 @@ dependencies {
// 本地依赖
implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
// 公共依赖
implementation project(":basic-common:core")
implementation project(":basic-common:util")
// 服务依赖
implementation project(":app-push")
// Optional: Redis
implementation project(":basic-common:redis")
// Optional: Doc
implementation project(":basic-common:doc")
implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
// implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
// Optional: Auth
implementation project(":basic-auth")
......@@ -40,13 +48,28 @@ dependencies {
// fastjson
implementation "com.alibaba:fastjson:${fastJsonVersion}"
// hutool
implementation "cn.hutool:hutool-core:${hutoolVersion}"
implementation "cn.hutool:hutool-extra:${hutoolVersion}"
implementation "cn.hutool:hutool-http:${hutoolVersion}"
// JPA 增加空间字段支持
// https://blog.wuwii.com/jpa-spatial.html
implementation "org.hibernate:hibernate-spatial:${hibernateSpatialVersion}"
implementation("org.hibernate:hibernate-spatial:${hibernateSpatialVersion}") {
exclude group: 'org.postgresql', module: 'postgresql'
}
// JTS 几何对象操作库
implementation "org.locationtech.jts:jts-core:${jtsVersion}"
// https://mvnrepository.com/artifact/com.graphhopper.external/jackson-datatype-jts
implementation 'com.graphhopper.external:jackson-datatype-jts:1.0-2.7'
// https://github.com/vladmihalcea/hibernate-types
// hibernate-types-55
implementation "com.vladmihalcea:hibernate-types-55:${hibernateTypesVersion}"
// myexcel
implementation "com.github.liaochong:myexcel:${myexcelVersion}"
// https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-openfeign
implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${openfeignVersion}"
}
......@@ -4,6 +4,7 @@ package com.yiring.app;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
......@@ -12,6 +13,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
basePackageClasses = { Application.class, Jsr310JpaConverters.class },
basePackages = Application.BASE_PACKAGES
)
@EnableFeignClients
@SpringBootApplication(scanBasePackages = Application.BASE_PACKAGES)
public class Application {
......
......@@ -43,8 +43,7 @@ public class GlobalExceptionHandler {
String error = "未知参数校验错误";
if (e instanceof ConstraintViolationException) {
ConstraintViolationException ex = (ConstraintViolationException) e;
error = ex.getConstraintViolations().iterator().next().getMessage();
error = ((ConstraintViolationException) e).getConstraintViolations().iterator().next().getMessage();
} else {
BindingResult result = null;
if (e instanceof MethodArgumentNotValidException) {
......@@ -95,7 +94,7 @@ public class GlobalExceptionHandler {
* 失败状态异常
*/
@ExceptionHandler(value = FailStatusException.class)
public Result<String> customCodeExceptionHandler(FailStatusException e) {
public Result<String> failStatusExceptionHandler(FailStatusException e) {
return Result.no(e.getStatus());
}
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.config;
import com.bedatadriven.jackson.datatype.jts.JtsModule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author Jim
* @version 0.1
* 2022/4/8 11:18
*/
@Configuration
public class JtsModuleConfig {
@Bean
public JtsModule jtsModule() {
return new JtsModule();
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.config.converter;
import com.alibaba.fastjson.JSONArray;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
/**
* JSONArray JPA 类型转换
*
* @author Jim
* @version 0.1
* 2022/4/7 18:03
*/
@Converter
public class JSONArrayConverter implements AttributeConverter<JSONArray, String> {
@Override
public String convertToDatabaseColumn(JSONArray json) {
return json.toJSONString();
}
@Override
public JSONArray convertToEntityAttribute(String s) {
return JSONArray.parseArray(s);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.config.converter;
import com.alibaba.fastjson.JSONObject;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
/**
* JSONObject JPA 类型转换
*
* @author Jim
* @version 0.1
* 2022/4/7 18:03
*/
@Converter
public class JSONObjectConverter implements AttributeConverter<JSONObject, String> {
@Override
public String convertToDatabaseColumn(JSONObject json) {
return json.toJSONString();
}
@Override
public JSONObject convertToEntityAttribute(String s) {
return JSONObject.parseObject(s);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.config.dialect;
import java.io.Serial;
import org.hibernate.spatial.dialect.postgis.PostgisPG10Dialect;
/**
......@@ -15,6 +16,7 @@ import org.hibernate.spatial.dialect.postgis.PostgisPG10Dialect;
@SuppressWarnings({ "unused" })
public class PostgresDialect extends PostgisPG10Dialect {
@Serial
private static final long serialVersionUID = 187383913873678550L;
public PostgresDialect() {
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.config.zy;
import javax.annotation.Resource;
import lombok.AccessLevel;
import lombok.Data;
import lombok.experimental.FieldDefaults;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* 真源配置想
*
* @author ifzm
* @version 0.1
* 2019/9/25 21:31
*/
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Component
@ConfigurationProperties(prefix = "zy-config")
public class ZyConfigProperties {
String host;
@Resource
ZyConfigRabbitmq rabbitmq;
@Resource
ZyConfigOpen open;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Component
@ConfigurationProperties(prefix = "zy-config.rabbitmq")
public static class ZyConfigRabbitmq {
boolean enabled;
String host;
int port;
String username;
String password;
String virtualHost;
String queueName;
}
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Component
@ConfigurationProperties(prefix = "zy-config.open")
public static class ZyConfigOpen {
String api;
String clientId;
String grantType;
String clientSecret;
String tenant;
}
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Component
@ConfigurationProperties(prefix = "zy-config.proxy")
public static class ZyConfigProxy {
String api;
String tenant;
@Resource
ZyConfigProxyClient client;
@Resource
ZyConfigProxyManage manage;
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Component
@ConfigurationProperties(prefix = "zy-config.proxy.client")
public static class ZyConfigProxyClient {
String username;
String password;
}
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Component
@ConfigurationProperties(prefix = "zy-config.proxy.manage")
public static class ZyConfigProxyManage {
String username;
String password;
}
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.config.zy;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.AcknowledgeMode;
import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* 真源 RabbitMQ 订阅配置
*
* @author Jim
* @version 0.1
* 2022/4/13 17:05
*/
@Slf4j
@Configuration
@ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
public class ZyRabbitConfig {
@Resource
ZyConfigProperties.ZyConfigRabbitmq rabbitmq;
@Resource
ConfigurableApplicationContext context;
public static final String CONNECTION_FACTORY_NAME = "zyRabbitConnectionFactory";
public static final String LISTENER_FACTORY_NAME = "zyRabbitListenerFactory";
/**
* 消息队列名称(必须要与配置文件中的 queue-name 完全一致)
* 规则: tenant_msg_${open.client-secret}_${open.client-id}
* 参见文档: 定位平台接口规范V3.0.1 - 通用版.pdf #6
*/
public static final String MESSAGE_QUEUES_NAME = "tenant_msg_12A14FDC_sc21080400";
@Bean(CONNECTION_FACTORY_NAME)
public CachingConnectionFactory zyConnectionFactory() {
return connectionFactory(
rabbitmq.getHost(),
rabbitmq.getPort(),
rabbitmq.getUsername(),
rabbitmq.getPassword(),
rabbitmq.getVirtualHost()
);
}
@Bean(LISTENER_FACTORY_NAME)
public SimpleRabbitListenerContainerFactory secondFactory(
SimpleRabbitListenerContainerFactoryConfigurer configurer,
@Qualifier(CONNECTION_FACTORY_NAME) CachingConnectionFactory connectionFactory
) {
// 检查队列名称是否与配置文件一致,避免监听错误
if (!MESSAGE_QUEUES_NAME.equals(rabbitmq.getQueueName())) {
log.error("队列名称不一致,请检查配置文件");
context.close();
return null;
}
SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
// 最小消费者数量
factory.setConcurrentConsumers(1);
// 最大消费者数量
factory.setMaxConcurrentConsumers(1);
// 预读取一条消息
factory.setPrefetchCount(1);
// 手动确认消息模式
factory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
configurer.configure(factory, connectionFactory);
return factory;
}
public CachingConnectionFactory connectionFactory(
String host,
int port,
String username,
String password,
String virtualHost
) {
CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
connectionFactory.setHost(host);
connectionFactory.setPort(port);
connectionFactory.setUsername(username);
connectionFactory.setPassword(password);
connectionFactory.setVirtualHost(virtualHost);
return connectionFactory;
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.constant;
/**
* Redis Key 常量类
*
* @author fangzhimin
* 2018/9/4 15:51
*/
public interface RedisKey {
/**
* STOMP 在线用户关键数据
*/
String STOMP_ONLINE_USERS = "STOMP_ONLINE_USERS";
}
......@@ -2,14 +2,17 @@
package com.yiring.app.domain.car;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiring.common.annotation.Excel;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......@@ -30,6 +33,9 @@ import org.hibernate.snowflake.SnowflakeId;
@Comment("车辆")
public class Car implements Serializable {
@Serial
private static final long serialVersionUID = 8775607064296075463L;
@Id
@Comment("主键id")
@GeneratedValue(generator = SnowflakeId.GENERATOR)
......@@ -37,48 +43,37 @@ public class Car implements Serializable {
Long id;
@Comment("车牌号")
@Excel(name = "车牌", sort = 1)
String carNum;
@Comment("车辆类型")
@Excel(name = "车辆类型", sort = 2, dictType = "car_type")
String carType;
@Comment("司机名称")
@Excel(name = "司机", sort = 3)
String driverName;
@Comment("司机电话")
@Excel(name = "联系电话", sort = 4)
String driverMobile;
@Comment("标签卡")
@Excel(name = "标签卡", sort = 9)
String labelCard;
@Comment("标签卡状态")
@Excel(name = "标签卡状态", sort = 10, dictType = "car_label_status")
String labelCardStatus;
@Comment("所属单位id")
@Excel(name = "所属单位", sort = 5)
String orgId;
@Comment("被访人id")
@Excel(name = "被访人", sort = 7)
String intervieweeId;
@Comment("来访原因")
@Excel(name = "来访原因", sort = 6)
String reason;
@Comment("收卡时间")
@Excel(name = "收卡时间", sort = 11, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
LocalDateTime cardRecTime;
@Comment("创建时间")
@Excel(name = "到访时间", sort = 8, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
LocalDateTime createTime;
......
......@@ -2,6 +2,7 @@
package com.yiring.app.domain.location;
import com.yiring.common.annotation.FieldMapping;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
......@@ -11,16 +12,17 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import org.hibernate.snowflake.SnowflakeId;
import org.locationtech.jts.geom.Point;
/**
* 定位信标
* 引用:
* 1. 查询地图分区(定位系统), https://nl.yz-cloud.com/position/area/list
* 2. 查询信标点(定位系统), https://nl.yz-cloud.com/position/config/point/list
* 1. 查询地图分区(定位系统), <a href="https://nl.yz-cloud.com/position/area/list">https://nl.yz-cloud.com/position/area/list</a>
* 2. 查询信标点(定位系统), <a href="https://nl.yz-cloud.com/position/config/point/list">https://nl.yz-cloud.com/position/config/point/list</a>
*
* @author Jim
* @version 0.1
......@@ -43,6 +45,7 @@ import org.locationtech.jts.geom.Point;
@Comment("定位信标")
public class LocationBeacon implements Serializable {
@Serial
private static final long serialVersionUID = 5419734189897829250L;
@Comment("主键")
......@@ -84,6 +87,8 @@ public class LocationBeacon implements Serializable {
Double distance;
@Comment("坐标点信息")
@Type(type = "jts_geometry")
@Column(columnDefinition = "point")
Point point;
@FieldMapping
......
......@@ -2,6 +2,7 @@
package com.yiring.app.domain.location;
import com.yiring.common.annotation.FieldMapping;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.HashSet;
......@@ -10,8 +11,9 @@ import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import org.hibernate.snowflake.SnowflakeId;
import org.locationtech.jts.geom.Geometry;
......@@ -37,6 +39,7 @@ import org.locationtech.jts.geom.Geometry;
@Comment("围栏")
public class LocationFence implements Serializable {
@Serial
private static final long serialVersionUID = 4155868702188991300L;
@Comment("主键")
......@@ -69,6 +72,8 @@ public class LocationFence implements Serializable {
String shapeType;
@Comment("空间信息")
@Type(type = "jts_geometry")
@Column(columnDefinition = "geometry")
Geometry geometry;
@Comment("半径,米/单位(圆形围栏)")
......
......@@ -3,6 +3,7 @@ package com.yiring.app.domain.location;
import com.yiring.auth.domain.user.User;
import com.yiring.common.annotation.FieldMapping;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalTime;
import java.util.HashSet;
......@@ -11,7 +12,7 @@ import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......@@ -33,10 +34,11 @@ import org.hibernate.snowflake.SnowflakeId;
@FieldNameConstants
@FieldDefaults(level = AccessLevel.PRIVATE)
@Entity
@Table(name = "BS_LOCATION_FENCE_RULE", indexes = {})
@Table(name = "BS_LOCATION_FENCE_RULE")
@Comment("围栏规则")
public class LocationFenceRule implements Serializable {
@Serial
private static final long serialVersionUID = -6683465582430417205L;
@Comment("主键")
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.domain.location;
import com.alibaba.fastjson.JSONObject;
import com.yiring.app.config.converter.JSONObjectConverter;
import com.alibaba.fastjson.JSON;
import com.vladmihalcea.hibernate.type.json.JsonType;
import com.yiring.auth.domain.user.User;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
......@@ -15,8 +16,10 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.snowflake.SnowflakeId;
import org.locationtech.jts.geom.Point;
......@@ -38,10 +41,12 @@ import org.locationtech.jts.geom.Point;
@FieldNameConstants
@FieldDefaults(level = AccessLevel.PRIVATE)
@Entity
@TypeDef(name = "json", typeClass = JsonType.class)
@Table(name = "BS_LOCATION_LOG", indexes = { @Index(columnList = "time"), @Index(columnList = "silent") })
@Comment("定位数据")
public class LocationLog implements Serializable {
@Serial
private static final long serialVersionUID = 3467455881020691989L;
@Comment("主键")
......@@ -83,7 +88,8 @@ public class LocationLog implements Serializable {
BigDecimal altitude;
@Comment("坐标点信息")
@Column(columnDefinition = "POINT")
@Type(type = "jts_geometry")
@Column(columnDefinition = "point")
Point point;
@Comment("信标集合")
......@@ -108,12 +114,9 @@ public class LocationLog implements Serializable {
String voltUnit;
@Comment("原始数据")
@Convert(converter = JSONObjectConverter.class)
@Lob
@Basic(fetch = FetchType.LAZY)
@Column(columnDefinition = "JSON")
@ToString.Exclude
JSONObject raw;
@org.hibernate.annotations.Type(type = "json")
@Column(columnDefinition = "json")
JSON raw;
@Comment("创建时间")
LocalDateTime createTime;
......
......@@ -3,6 +3,7 @@ package com.yiring.app.domain.location;
import com.yiring.auth.domain.user.User;
import com.yiring.common.annotation.FieldMapping;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Objects;
......@@ -11,7 +12,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......@@ -48,6 +49,7 @@ import org.hibernate.snowflake.SnowflakeId;
@Comment("定位标签")
public class LocationTag implements Serializable {
@Serial
private static final long serialVersionUID = 5419734189897829250L;
@Comment("主键")
......
/* (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> {}
......@@ -7,7 +7,7 @@ import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
import org.locationtech.jts.geom.Point;
......
......@@ -8,7 +8,7 @@ import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.excel.car;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* 2022/4/20 10:35
*/
@ExcelModel
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@FieldDefaults(level = AccessLevel.PRIVATE)
public class CarExportExcel implements Serializable {
private static final long serialVersionUID = -4019303809667111441L;
@ExcelColumn(title = "车牌")
String carNum;
@ExcelColumn(title = "车辆类型")
String carType;
@ExcelColumn(title = "司机")
String driverName;
@ExcelColumn(title = "联系电话")
String driverMobile;
@ExcelColumn(title = "所属单位")
String orgId;
@ExcelColumn(title = "来访原因", width = 15)
String reason;
@ExcelColumn(title = "被访人")
String intervieweeId;
@ExcelColumn(title = "到访时间", format = "yyyy-MM-dd HH:mm:ss", width = 15)
LocalDateTime cardSendTime;
@ExcelColumn(title = "标签卡")
String labelCard;
@ExcelColumn(title = "标签卡状态", mapping = "1:未发卡,2:使用中,3:已收卡")
String labelCardStatus;
@ExcelColumn(title = "收卡时间", format = "yyyy-MM-dd HH:mm:ss", width = 15)
LocalDateTime cardRecTime;
}
/* (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());
}
}
/* (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();
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.excel.video;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.locationtech.jts.geom.Point;
/**
* @author tzl
* 2022/4/20 16:21
*/
@ExcelModel
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VideoExportExcel implements Serializable {
@Serial
private static final long serialVersionUID = 5422685189135254189L;
@ExcelColumn(title = "编号", width = 10)
String uuid;
@ExcelColumn(title = "摄像头名称", width = 10)
String videoName;
@ExcelColumn(title = "坐标点信息(经度,纬度)", width = 10)
Point point;
@ExcelColumn(title = "m3u8 地址", width = 10)
String m3u8;
@ExcelColumn(title = "备注", width = 15)
String remark;
//
// String status;
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.excel.video;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import java.io.Serial;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
/**
* @author tzl
* 2022/4/20 16:21
*/
@ExcelModel
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VideoImportExcel implements Serializable {
@Serial
private static final long serialVersionUID = 5422685189135254189L;
@ExcelColumn(title = "编号")
String uuid;
@ExcelColumn(title = "摄像头名称")
String videoName;
@ExcelColumn(title = "m3u8 地址")
String m3u8;
@ExcelColumn(title = "备注")
String remark;
@ExcelColumn(title = "经度")
double lon;
@ExcelColumn(title = "纬度")
double lat;
// String status;
}
......@@ -2,6 +2,7 @@
package com.yiring.app.exception;
import com.yiring.app.constant.Code;
import java.io.Serial;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -19,6 +20,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class CodeException extends RuntimeException {
@Serial
private static final long serialVersionUID = -4226669531686389671L;
/**
......
......@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.yiring.app.param.video.StreamProxyItem;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;
/**
......@@ -14,18 +13,35 @@ import org.springframework.web.bind.annotation.*;
*/
@FeignClient(url = "${env.host}:3008", name = "gb")
public interface GbClient {
/**
* 国标登录接口
* @param username 用户名
* @param password 密码
* @return Response
*/
@RequestMapping(value = "/api/user/login", method = RequestMethod.GET)
Response userLogin(
@RequestParam(name = "username") String username,
@RequestParam(name = "password") String password
);
/**
* 拉流数据同步接口
* @param streamProxyItem 拉流对象
* @param cookie cookie
* @return 是否成功
*/
@RequestMapping(value = "/api/proxy/save", method = RequestMethod.POST)
@Async
JSONObject proxySave(@RequestBody StreamProxyItem streamProxyItem, @RequestHeader("Cookie") String cookie);
/**
* 拉流删除接口
* @param app 流应用名
* @param stream 流编号
* @param cookie cookie
* @return 是否成功
*/
@RequestMapping(value = "/api/proxy/del", method = RequestMethod.DELETE)
@Async
JSONObject proxyDel(
@RequestParam(name = "app") String app,
@RequestParam(name = "stream") String stream,
......
......@@ -4,6 +4,7 @@ package com.yiring.app.param.car;
import com.yiring.common.constant.RegEx;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
......@@ -20,7 +21,9 @@ import lombok.experimental.FieldDefaults;
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class CarParam {
public class CarParam implements Serializable {
private static final long serialVersionUID = 521351582969232371L;
@ApiModelProperty(value = "车牌号码", example = "湘A99999", required = true)
@NotEmpty(message = "车牌号码不能为空")
......
......@@ -3,6 +3,7 @@ package com.yiring.app.param.car;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -17,14 +18,14 @@ import lombok.experimental.FieldDefaults;
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class CarQueryParam {
public class CarQueryParam implements Serializable {
private static final long serialVersionUID = -2107446950936463302L;
@ApiModelProperty(value = "每页记录数", example = "10")
// @DecimalMin(value = "1", message = "分页条数不能小于1")
Integer pageSize;
@ApiModelProperty(value = "页码", example = "1")
// @DecimalMin(value = "1", message = "页码不能小于1")
Integer pageNo;
@ApiModelProperty(value = "车牌号码", example = "湘A12345")
......
......@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -17,7 +18,9 @@ import lombok.experimental.FieldDefaults;
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class DictParam {
public class DictParam implements Serializable {
private static final long serialVersionUID = -6297680882890239905L;
@ApiModelProperty(value = "排序", example = "1", required = true)
Integer dictSort;
......
......@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -16,7 +17,9 @@ import lombok.experimental.FieldDefaults;
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class DictQueryParam {
public class DictQueryParam implements Serializable {
private static final long serialVersionUID = 558672306975530791L;
@ApiModelProperty(value = "字典标签", example = "男")
String dictLabel;
......
......@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -17,7 +18,9 @@ import lombok.experimental.FieldDefaults;
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class DictTypeParam {
public class DictTypeParam implements Serializable {
private static final long serialVersionUID = -4725073029525910806L;
@ApiModelProperty(value = "字典名称", example = "性别", required = true)
@NotEmpty(message = "字典名称不能为空")
......
......@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -16,7 +17,9 @@ import lombok.experimental.FieldDefaults;
@NoArgsConstructor
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
public class DictTypeQueryParam {
public class DictTypeQueryParam implements Serializable {
private static final long serialVersionUID = -2940949823473695962L;
@ApiModelProperty(value = "字典名称", example = "性别")
String dictName;
......
/* (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();
}
}
/* (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;
}
/* (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;
}
/* (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();
}
}
/* (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();
}
}
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import lombok.*;
import lombok.experimental.FieldDefaults;
......@@ -23,11 +24,13 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VideoParam implements Serializable {
private static final long serialVersionUID = 6031274771790265507L;
@ApiModelProperty(value = "编号", example = "88888888", required = true)
@NotEmpty(message = "标识不能为空")
String uuid;
@ApiModelProperty(value = "m3u8 媒体地址", example = "", required = true)
@ApiModelProperty(value = "m3u8 媒体地址", example = "m3u8 媒体地址", required = true)
@NotEmpty(message = "m3u8 媒体地址不能为空")
String m3u8;
......@@ -35,12 +38,12 @@ public class VideoParam implements Serializable {
@NotEmpty(message = "摄像头名称不能为空")
String videoName;
@ApiModelProperty(value = "经度", example = "1", required = true)
@NotEmpty(message = "经度")
@ApiModelProperty(value = "经度", example = "1.00", required = true)
@NotNull(message = "经度")
double lon;
@ApiModelProperty(value = "纬度", example = "1", required = true)
@NotEmpty(message = "纬度")
@ApiModelProperty(value = "纬度", example = "1.00", required = true)
@NotNull(message = "纬度")
double lat;
@ApiModelProperty(value = "备注", example = "厂区摄像头")
......
......@@ -21,6 +21,8 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VideoQueryParam implements Serializable {
private static final long serialVersionUID = -330684070308585411L;
@ApiModelProperty(value = "编号", example = "88888888")
String uuid;
......@@ -29,6 +31,12 @@ public class VideoQueryParam implements Serializable {
@ApiModelProperty(value = "状态", example = "1")
String status;
@ApiModelProperty(value = "分页条数", example = "10")
Integer pageSize;
@ApiModelProperty(value = "当前页数", example = "1")
Integer pageNo;
// @ApiModelProperty(value = "m3u8 地址", example = "")
// @NotEmpty(message = "m3u8 地址不能为空")
// String m3u8;
......
......@@ -19,4 +19,6 @@ import lombok.experimental.FieldDefaults;
public class VisitorQueryParam implements Serializable {
private static final long serialVersionUID = -4314254785949101573L;
String id;
}
/* (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 {}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.rabbitmq;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* rabbitmq配置
*
* @author ifzm
* 2019/8/21 16:07
*/
@SuppressWarnings({ "unused" })
@Slf4j
@Component
@Transactional(rollbackFor = Exception.class)
public class RabbitReceiver {}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.rabbitmq.zy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.rabbitmq.client.Channel;
import com.yiring.app.config.zy.ZyRabbitConfig;
import com.yiring.app.push.domain.PushMessage;
import com.yiring.app.push.service.PushService;
import java.io.IOException;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* 国标 RabbitMQ 消息监听(消息消费者)
*
* @author tzl
* @version 0.1
* 2022/4/13 17:13
*/
@Slf4j
@Component
@Configuration
@ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
public class GbRabbitmqReceiver {
// TODO
// 1. 新增消息订阅定时任务,检查是否正常订阅了真源定位系统的消息
// 2. 如果没有所需的订阅记录,则发起消息订阅(见接口文档: 6.2)
// 3. 订阅 position(定位数据)、lowPower(低电量报警)、deviceStatus(设备状态)、keyWarning(按键报警)
@Resource
PushService pushService;
/**
* 订阅真源定位系统 RabbitMQ 推送过来的消息(主动订阅的一些消息类别)
* 参见: 定位平台接口规范V3.0.1 - 通用版.pdf #6
* @param msg 消息内容
* @param channel 消息通道
* @param message 消息主体
* @throws IOException 消息确认异常
*/
@RabbitHandler
@RabbitListener(
queues = ZyRabbitConfig.MESSAGE_QUEUES_NAME,
containerFactory = ZyRabbitConfig.LISTENER_FACTORY_NAME
)
public void listen(String msg, Channel channel, Message message) throws IOException {
// 手动确认消息已收到
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
try {
// 将消息转换成 JSON 格式
JSONObject info = JSON.parseObject(msg);
log.info("Receiver Message: {}", info);
// 解构消息内容
JSONObject data = info.getJSONObject("params");
String method = info.getString("method");
switch (method) {
// 实时定位
case "position" -> processPositionMessage(data);
// 设备低电量
case "lowPower" -> processLowPowerMessage(data);
// 设备状态变更
case "deviceStatus" -> processDeviceStatusMessage(data);
// 按键报警
case "keyWarning" -> processKeyWarningMessage(data);
default -> log.warn("Unknown Message Type: {}", info);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
/**
* 处理定位消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processPositionMessage(JSONObject data) {
// TODO
log.info("Position Message: {}", data);
// 包装消息
// TODO
// 1. 解析消息内容,进行围栏、出入标识判断等处理,将定位记录录入数据库
// 2. 创建一条需要进行消息推送的记录
// 3. 将记录推送的消息推送模块
// WebSocket 消息推送
pushService.push(PushMessage.Type.WS, data);
}
/**
* 处理低电量报警消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processLowPowerMessage(JSONObject data) {
// TODO
log.info("LowPower Message: {}", data);
}
/**
* 处理设备状态更新消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processDeviceStatusMessage(JSONObject data) {
// TODO
log.info("DeviceStatus Message: {}", data);
}
/**
* 处理按键报警消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processKeyWarningMessage(JSONObject data) {
// TODO
log.info("KeyWarning Message: {}", data);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.rabbitmq.zy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.rabbitmq.client.Channel;
import com.yiring.app.config.zy.ZyRabbitConfig;
import com.yiring.app.push.domain.PushMessage;
import com.yiring.app.push.service.PushService;
import java.io.IOException;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* 真源 RabbitMQ 消息监听(消息消费者)
*
* @author Jim
* @version 0.1
* 2022/4/13 17:13
*/
@Slf4j
@Component
@Configuration
@ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
public class ZyRabbitmqReceiver {
// TODO
// 1. 新增消息订阅定时任务,检查是否正常订阅了真源定位系统的消息
// 2. 如果没有所需的订阅记录,则发起消息订阅(见接口文档: 6.2)
// 3. 订阅 position(定位数据)、lowPower(低电量报警)、deviceStatus(设备状态)、keyWarning(按键报警)
@Resource
PushService pushService;
/**
* 订阅真源定位系统 RabbitMQ 推送过来的消息(主动订阅的一些消息类别)
* 参见: 定位平台接口规范V3.0.1 - 通用版.pdf #6
* @param msg 消息内容
* @param channel 消息通道
* @param message 消息主体
* @throws IOException 消息确认异常
*/
@RabbitHandler
@RabbitListener(
queues = ZyRabbitConfig.MESSAGE_QUEUES_NAME,
containerFactory = ZyRabbitConfig.LISTENER_FACTORY_NAME
)
public void listen(String msg, Channel channel, Message message) throws IOException {
// 手动确认消息已收到
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
try {
// 将消息转换成 JSON 格式
JSONObject info = JSON.parseObject(msg);
log.info("Receiver Message: {}", info);
// 解构消息内容
JSONObject data = info.getJSONObject("params");
String method = info.getString("method");
switch (method) {
// 实时定位
case "position" -> processPositionMessage(data);
// 设备低电量
case "lowPower" -> processLowPowerMessage(data);
// 设备状态变更
case "deviceStatus" -> processDeviceStatusMessage(data);
// 按键报警
case "keyWarning" -> processKeyWarningMessage(data);
default -> log.warn("Unknown Message Type: {}", info);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
/**
* 处理定位消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processPositionMessage(JSONObject data) {
// TODO
log.info("Position Message: {}", data);
// 包装消息
// TODO
// 1. 解析消息内容,进行围栏、出入标识判断等处理,将定位记录录入数据库
// 2. 创建一条需要进行消息推送的记录
// 3. 将记录推送的消息推送模块
// WebSocket 消息推送
pushService.push(PushMessage.Type.WS, data);
}
/**
* 处理低电量报警消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processLowPowerMessage(JSONObject data) {
// TODO
log.info("LowPower Message: {}", data);
}
/**
* 处理设备状态更新消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processDeviceStatusMessage(JSONObject data) {
// TODO
log.info("DeviceStatus Message: {}", data);
}
/**
* 处理按键报警消息
* @param data 消息内容
*/
@Transactional(rollbackFor = Exception.class)
public void processKeyWarningMessage(JSONObject data) {
// TODO
log.info("KeyWarning Message: {}", data);
}
}
......@@ -8,7 +8,7 @@ import com.yiring.app.vo.car.CarVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.vo.PageVo;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.data.jpa.domain.Specification;
/**
......@@ -28,6 +28,7 @@ public interface CarService {
* 修改车辆来访信息
*
* @param carParam CarParam
* @param idParam IdParam
* @return 修改的车辆来访信息id
*/
Result<Long> updateCarInfo(CarParam carParam, IdParam idParam);
......@@ -44,6 +45,7 @@ public interface CarService {
* 发卡
*
* @param idParam IdParam
* @param labelCard String
* @return 发卡信息id
*/
Result<Long> cardSend(IdParam idParam, String labelCard);
......@@ -73,9 +75,11 @@ public interface CarService {
Result<PageVo<CarVo>> pageCarInfo(CarQueryParam carParam);
/**
* 导出excel
* 导出接口
* @param carParam CarQueryParam
* @param response HttpServletResponse
*/
List<Car> export(CarQueryParam carParam);
void export(CarQueryParam carParam, HttpServletResponse response);
/**
* 检查是否存在相同车牌号登记
......@@ -94,6 +98,7 @@ public interface CarService {
boolean hasCarInfoByMobile(String param);
/**
* 筛选条件
* @param carParam CarQueryParam
* @return Specification
*/
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.car.impl;
import cn.hutool.core.util.StrUtil;
import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
import com.yiring.app.domain.car.Car;
import com.yiring.app.domain.car.CarRepository;
import com.yiring.app.excel.car.CarExportExcel;
import com.yiring.app.param.car.CarParam;
import com.yiring.app.param.car.CarQueryParam;
import com.yiring.app.service.car.CarService;
......@@ -11,24 +14,34 @@ import com.yiring.auth.domain.role.Role;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import com.yiring.common.param.IdParam;
import com.yiring.common.util.StrUtils;
import com.yiring.common.util.date.DateUtils;
import com.yiring.common.vo.PageVo;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.persistence.criteria.Predicate;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.*;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author tzl
* 2022/4/11 13:58
*/
@Slf4j
@Transactional(rollbackFor = RuntimeException.class)
@Service
public class CarServiceImpl implements CarService {
......@@ -69,7 +82,7 @@ public class CarServiceImpl implements CarService {
}
Car car = optional.get();
//如果标签卡在使用中无法修改
if (StringUtils.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
if (StrUtil.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法修改");
}
if (!car.getCarNum().equals(carParam.getCarNum())) {
......@@ -147,7 +160,7 @@ public class CarServiceImpl implements CarService {
@Override
public Result<PageVo<CarVo>> pageCarInfo(CarQueryParam carParam) {
PageVo<CarVo> resultVo = null;
PageVo<CarVo> resultVo;
//排序
Sort sort = Sort.by(Sort.Order.desc(Car.Fields.createTime));
//如果传分页参数则分页,否查全部数据
......@@ -180,8 +193,45 @@ public class CarServiceImpl implements CarService {
}
@Override
public List<Car> export(CarQueryParam carParam) {
return carRepository.findAll(condition(carParam));
public void export(CarQueryParam carParam, HttpServletResponse response) {
Specification<Car> specification = condition(carParam);
List<Car> all = carRepository.findAll(specification);
List<CarExportExcel> data = all
.stream()
.map(car -> {
CarExportExcel carExportExcel = new CarExportExcel();
BeanUtils.copyProperties(car, carExportExcel);
return carExportExcel;
})
.collect(Collectors.toList());
try (
DefaultStreamExcelBuilder<CarExportExcel> streamExcelBuilder = DefaultStreamExcelBuilder
.of(CarExportExcel.class)
.threadPool(Executors.newFixedThreadPool(2))
.rowHeight(14)
.titleRowHeight(14)
.style(
"cell->vertical-align:center;text-align:center",
"title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
)
.start()
) {
streamExcelBuilder.append(data);
String fileName = URLEncoder.encode("车辆来访信息.xlsx", StandardCharsets.UTF_8);
response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
OutputStream out = response.getOutputStream();
Workbook workbook = streamExcelBuilder.fixedTitles().build();
workbook.write(out);
workbook.close();
out.flush();
out.close();
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new RuntimeException("导出车辆来访信息失败: " + e.getMessage());
}
}
@Override
......@@ -207,24 +257,24 @@ public class CarServiceImpl implements CarService {
return (root, query, criteriaBuilder) -> {
List<Predicate> list = new ArrayList<>();
//查询条件
if (StrUtils.isNotBlank(carParam.getCarNum())) {
if (StrUtil.isNotBlank(carParam.getCarNum())) {
//车牌号码查询
list.add(criteriaBuilder.like(root.get("carNum").as(String.class), "%" + carParam.getCarNum() + "%"));
list.add(criteriaBuilder.like(root.get(Car.Fields.carNum), "%" + carParam.getCarNum() + "%"));
}
if (StrUtils.isNotBlank(carParam.getCarType())) {
if (StrUtil.isNotBlank(carParam.getCarType())) {
//车辆类型查询
list.add(criteriaBuilder.like(root.get("carType").as(String.class), "%" + carParam.getCarType() + "%"));
}
if (StrUtils.isNotBlank(carParam.getDriverName())) {
if (StrUtil.isNotBlank(carParam.getDriverName())) {
//司机名称查询
list.add(
criteriaBuilder.like(root.get("driverName").as(String.class), "%" + carParam.getDriverName() + "%")
);
}
if (StrUtils.isNotBlank(carParam.getDriverMobile())) {
if (StrUtil.isNotBlank(carParam.getDriverMobile())) {
//司机电话号码查询
list.add(
criteriaBuilder.like(
......@@ -234,50 +284,48 @@ public class CarServiceImpl implements CarService {
);
}
if (StrUtils.isNotBlank(carParam.getOrgId())) {
if (StrUtil.isNotBlank(carParam.getOrgId())) {
//所属单位查询
list.add(criteriaBuilder.like(root.get("orgId").as(String.class), "%" + carParam.getOrgId() + "%"));
}
if (StrUtils.isNotBlank(carParam.getReason())) {
if (StrUtil.isNotBlank(carParam.getReason())) {
//来访原因查询
list.add(criteriaBuilder.like(root.get("reason").as(String.class), "%" + carParam.getReason() + "%"));
}
if (StrUtils.isNotNull(carParam.getCreateTimeStart()) && StrUtils.isNotNull(carParam.getCreateTimeEnd())) {
if (Objects.nonNull(carParam.getCreateTimeStart()) && Objects.nonNull(carParam.getCreateTimeEnd())) {
//来访时间区间段查询
list.add(
criteriaBuilder.between(
root.get("createTime").as(Date.class),
DateUtils.toDate(carParam.getCreateTimeStart()),
DateUtils.toDate(carParam.getCreateTimeEnd())
root.get(Car.Fields.createTime),
carParam.getCreateTimeStart(),
carParam.getCreateTimeEnd()
)
);
}
if (StrUtils.isNotBlank(carParam.getLabelCard())) {
if (StrUtil.isNotBlank(carParam.getLabelCard())) {
//标签卡号查询
list.add(
criteriaBuilder.like(root.get("labelCard").as(String.class), "%" + carParam.getLabelCard() + "%")
);
}
if (StrUtils.isNotBlank(carParam.getLabelCardStatus())) {
if (StrUtil.isNotBlank(carParam.getLabelCardStatus())) {
//标签卡状态查询
list.add(
criteriaBuilder.equal(root.get("labelCardStatus").as(String.class), carParam.getLabelCardStatus())
);
}
if (
StrUtils.isNotNull(carParam.getCardRecTimeStart()) && StrUtils.isNotNull(carParam.getCardRecTimeEnd())
) {
if (Objects.nonNull(carParam.getCardRecTimeStart()) && Objects.nonNull(carParam.getCardRecTimeEnd())) {
//来访时间区间段查询
list.add(
criteriaBuilder.between(
root.get("cardRecTime").as(Date.class),
DateUtils.toDate(carParam.getCardRecTimeStart()),
DateUtils.toDate(carParam.getCardRecTimeEnd())
root.get(Car.Fields.cardRecTime),
carParam.getCardRecTimeStart(),
carParam.getCardRecTimeEnd()
)
);
}
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.dict.impl;
import cn.hutool.core.util.StrUtil;
import com.yiring.app.param.dict.DictParam;
import com.yiring.app.param.dict.DictQueryParam;
import com.yiring.app.service.dict.DictService;
......@@ -11,7 +12,6 @@ import com.yiring.common.dict.DictRepository;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.util.DictUtils;
import com.yiring.common.util.StrUtils;
import com.yiring.common.vo.PageVo;
import java.time.LocalDateTime;
import java.util.*;
......@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
* @author tzl
* 2022/4/13 15:37
*/
@Service
public class DictServiceImpl implements DictService {
......@@ -162,7 +163,7 @@ public class DictServiceImpl implements DictService {
public Specification<Dict> condition(DictQueryParam dictQueryParam) {
return (root, query, criteriaBuilder) -> {
List<Predicate> list = new ArrayList<>();
if (StrUtils.isNotBlank(dictQueryParam.getDictType())) {
if (StrUtil.isNotBlank(dictQueryParam.getDictType())) {
list.add(
criteriaBuilder.like(
root.get("dictType").as(String.class),
......@@ -171,7 +172,7 @@ public class DictServiceImpl implements DictService {
);
}
if (StrUtils.isNotBlank(dictQueryParam.getDictLabel())) {
if (StrUtil.isNotBlank(dictQueryParam.getDictLabel())) {
list.add(
criteriaBuilder.like(
root.get("dictLabel").as(String.class),
......
/* (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);
}
/* (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();
};
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.service.video;
import com.yiring.app.domain.video.Video;
import com.yiring.app.param.video.VideoParam;
import com.yiring.app.param.video.VideoQueryParam;
import com.yiring.app.vo.video.VideoVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import java.awt.*;
import javax.servlet.http.HttpServletResponse;
import org.locationtech.jts.geom.Point;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.web.multipart.MultipartFile;
/**
* @author tzl
......@@ -57,10 +60,32 @@ public interface VideoService {
/**
* 分页查询
* @param videoQueryParam 筛选条件
* @param param 分页参数
* @return Result<PageVo<VideoVo>> 分页结果集
* @author tzl
* @date 2022/4/15 14:35
*/
Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam, PageParam param);
Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam);
/**
* 查询条件
* @param videoQueryParam 查询条件
* @return Specification<Video>
* @author tzl
* @date 2022/4/15 14:57
*/
Specification<Video> condition(VideoQueryParam videoQueryParam);
/**
* 条件查询数据导出
* @param videoQueryParam 查询条件
* @param response HttpServletResponse
*/
void exportVideo(VideoQueryParam videoQueryParam, HttpServletResponse response);
/**
* 导入视频监控点位信息
* @param file 上传的excel文件
* @return 是否成功
*/
Result<String> importVideo(MultipartFile file);
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import com.yiring.app.constant.RedisKey;
import com.yiring.auth.domain.user.User;
import com.yiring.auth.util.Auths;
import com.yiring.common.core.Redis;
import java.util.LinkedList;
import java.util.Map;
import javax.annotation.Resource;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.stomp.StompCommand;
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.messaging.support.NativeMessageHeaderAccessor;
import org.springframework.stereotype.Component;
/**
* ClientInboundChannelInterceptor
* 接收客户端消息的拦截器
*
* @author ifzm
* @version 0.1
* 2019/9/28 20:58
*/
@Slf4j
@Component
public class ClientInboundChannelInterceptor implements ChannelInterceptor {
@Resource
Redis redis;
@Resource
Auths auths;
@Override
public Message<?> preSend(@NonNull Message<?> message, @NonNull MessageChannel channel) {
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
assert accessor != null;
if (StompCommand.CONNECT.equals(accessor.getCommand())) {
Object raw = message.getHeaders().get(NativeMessageHeaderAccessor.NATIVE_HEADERS);
if (raw instanceof Map) {
StompPrincipal principal = new StompPrincipal();
principal.setSession(accessor.getSessionId());
Object tokens = ((Map<?, ?>) raw).get("token");
if (tokens instanceof LinkedList) {
String token = ((LinkedList<?>) tokens).getFirst().toString();
User user = auths.getUserByToken(token);
principal.setUser(user.getUsername());
principal.setType(StompPrincipal.Type.LOGIN_USER);
} else {
principal.setUser("Guest." + principal.getSession());
principal.setType(StompPrincipal.Type.GUEST_USER);
}
accessor.setUser(principal);
redis.hset(RedisKey.STOMP_ONLINE_USERS, principal.getSession(), principal);
log.info(
"STOMP Online Users: {} (incr: +1, session: {}, user: `{}`)",
redis.hsize(RedisKey.STOMP_ONLINE_USERS),
principal.getSession(),
principal.getUser()
);
}
} else if (StompCommand.DISCONNECT.equals(accessor.getCommand())) {
StompPrincipal principal = (StompPrincipal) accessor.getUser();
assert principal != null;
if (
!message.getHeaders().containsKey(SimpMessageHeaderAccessor.HEART_BEAT_HEADER) &&
principal.getSession() != null
) {
redis.hdel(RedisKey.STOMP_ONLINE_USERS, principal.getSession());
log.info(
"STOMP Online Users: {} (incr: -1, session: {}, user: `{}`)",
redis.hsize(RedisKey.STOMP_ONLINE_USERS),
principal.getSession(),
principal.getUser()
);
}
}
return message;
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import com.alibaba.fastjson.JSON;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.simp.stomp.StompCommand;
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.stereotype.Component;
/**
* ClientOutboundChannelInterceptor
* 向客户端输出消息的拦截器
*
* @author ifzm
* @version 0.1
* 2019/10/12 11:05
*/
@Slf4j
@Component
public class ClientOutboundChannelInterceptor implements ChannelInterceptor {
@Override
public Message<?> preSend(@NonNull Message<?> message, @NonNull MessageChannel channel) {
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
assert accessor != null;
if (StompCommand.CONNECTED.equals(accessor.getCommand())) {
StompPrincipal principal = (StompPrincipal) accessor.getUser();
return MessageBuilder.createMessage(JSON.toJSONBytes(principal), message.getHeaders());
}
return message;
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import java.security.Principal;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import lombok.NonNull;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.event.SmartApplicationListener;
import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
import org.springframework.web.socket.messaging.SessionConnectedEvent;
import org.springframework.web.socket.messaging.SessionDisconnectEvent;
/**
* 自定义STOMP在线用户信息统计与操作
*
* @author ifzm
* @version 0.1
* 2019/10/10 21:19
*/
@Component
public class CustomStompUserRegistry implements StompUserRegistry, SmartApplicationListener {
/**
* sessionId, Principal
*/
private final Map<String, StompPrincipal> users = new ConcurrentHashMap<>();
private final Object userLock = new Object();
@Override
public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> eventType) {
return AbstractSubProtocolEvent.class.isAssignableFrom(eventType);
}
@Override
public void onApplicationEvent(@NonNull ApplicationEvent event) {
AbstractSubProtocolEvent subProtocolEvent = (AbstractSubProtocolEvent) event;
Message<?> message = subProtocolEvent.getMessage();
SimpMessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(
message,
SimpMessageHeaderAccessor.class
);
Assert.state(accessor != null, "No SimpMessageHeaderAccessor");
String sessionId = accessor.getSessionId();
Assert.state(sessionId != null, "No session id");
if (event instanceof SessionConnectedEvent) {
Principal user = subProtocolEvent.getUser();
synchronized (this.userLock) {
this.users.put(sessionId, (StompPrincipal) user);
}
} else if (event instanceof SessionDisconnectEvent) {
synchronized (this.userLock) {
this.users.remove(sessionId);
}
}
}
@Override
public Set<StompPrincipal> getUsers() {
return new HashSet<>(this.users.values());
}
@Override
public int getUserCount() {
return this.users.size();
}
@Override
public StompPrincipal getUser(String sessionId) {
return this.users.get(sessionId);
}
@Override
public void updateUser(String sessionId, StompPrincipal principal) {
synchronized (this.userLock) {
if (this.users.containsKey(sessionId)) {
this.users.put(sessionId, principal);
}
}
}
}
/* (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;
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import com.alibaba.fastjson.JSONObject;
import java.io.Serializable;
import java.security.Principal;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
/**
* StompPrincipal
*
* @author ifzm
* @version 0.1
* 2019/9/28 21:28
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
@FieldDefaults(level = AccessLevel.PRIVATE)
public class StompPrincipal implements Principal, Serializable {
private static final long serialVersionUID = 5351052642945180737L;
Type type;
String user;
String session;
JSONObject options;
@Override
public String getName() {
return this.session;
}
public enum Type {
/**
* 游客用户
*/
GUEST_USER,
/**
* 登录用户
*/
LOGIN_USER,
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import com.alibaba.fastjson.JSON;
import com.yiring.auth.domain.user.User;
import com.yiring.auth.util.Auths;
import com.yiring.common.core.Result;
import com.yiring.common.core.Status;
import com.yiring.common.util.Commons;
import java.util.Objects;
import java.util.Set;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
import org.springframework.messaging.simp.user.SimpUser;
import org.springframework.messaging.simp.user.SimpUserRegistry;
import org.springframework.stereotype.Controller;
/**
* STOMP Receiver Controller
*
* @author ifzm
* @version 0.1
* 2019/9/28 23:13
*/
@Slf4j
@Controller
public class StompReceiver {
@Resource
Auths auths;
@Resource
SimpMessagingTemplate simpMessagingTemplate;
@Resource
SimpUserRegistry simpUserRegistry;
@Resource
StompUserRegistry stompUserRegistry;
/**
* 登录
*
* @param accessor StompHeaderAccessor
*/
@MessageMapping("/login")
public void login(StompHeaderAccessor accessor, String token) {
try {
User user = auths.getUserByToken(token);
StompPrincipal principal = (StompPrincipal) accessor.getUser();
assert principal != null;
principal.setType(StompPrincipal.Type.LOGIN_USER);
principal.setUser(user.getUsername());
accessor.setUser(principal);
stompUserRegistry.updateUser(accessor.getSessionId(), principal);
log.info("STOMP user `{}` login success.", principal.getUser());
} catch (Exception e) {
simpMessagingTemplate.convertAndSendToUser(
Objects.requireNonNull(accessor.getSessionId()),
"/topic/notice",
Result.no(Status.UNAUTHORIZED, "token 无效,登录失败!")
);
}
}
/**
* 更新用户状态
*
* @param accessor 访问器
*/
@MessageMapping("/state")
public void state(StompHeaderAccessor accessor, String message) {
log.info("收到来自 STOMP Client `/app/state` 消息:{}", message);
StompPrincipal principal = (StompPrincipal) accessor.getUser();
assert principal != null;
principal.setOptions(JSON.parseObject(message));
accessor.setUser(principal);
log.info("principal info: {}", principal);
stompUserRegistry.updateUser(accessor.getSessionId(), principal);
}
@MessageMapping("/test")
public void test(StompHeaderAccessor accessor, String message) {
log.info("收到来自 STOMP Client `/app/test` 消息:{}", message);
Set<SimpUser> users = simpUserRegistry.getUsers();
log.info("{}", users);
simpMessagingTemplate.convertAndSendToUser(
Objects.requireNonNull(accessor.getSessionId()),
"/topic/reply",
Result.ok(Commons.uuid())
);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import java.util.Set;
/**
* STOMP 用户注册器
*
* @author ifzm
* @version 0.1
* 2019/10/10 21:57
*/
public interface StompUserRegistry {
/**
* 获取所有在线的用户信息
*
* @return 用户信息集合
*/
Set<StompPrincipal> getUsers();
/**
* 获取所有在线用户的数量
*
* @return 在线用户的数量
*/
int getUserCount();
/**
* 根据SessionId获取用户信息
*
* @param sessionId sessionId
* @return StompPrincipal
*/
StompPrincipal getUser(String sessionId);
/**
* 更新用户信息
*
* @param sessionId sessionId
* @param principal StompPrincipal
*/
void updateUser(String sessionId, StompPrincipal principal);
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.stomp;
import com.yiring.app.constant.RedisKey;
import com.yiring.common.core.Redis;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.ChannelRegistration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
/**
* WebSocketStompConfig
*
* @author ifzm
* @version 0.1
* 2019/9/25 20:12
*/
@Slf4j
@Configuration
@EnableScheduling
@EnableWebSocketMessageBroker
public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
@Resource
Redis redis;
@Resource
RabbitmqProperties rabbitmqProperties;
@Resource
ClientInboundChannelInterceptor clientInboundChannelInterceptor;
@Resource
ClientOutboundChannelInterceptor clientOutboundChannelInterceptor;
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
registry
.addEndpoint("/stomp/ws")
.setAllowedOriginPatterns("*")
.addInterceptors(new HttpSessionHandshakeInterceptor())
.withSockJS();
log.info("Init STOMP Endpoints Success.");
}
@Override
public void configureMessageBroker(MessageBrokerRegistry registry) {
// 启动前先删除掉可能存在的残留STOMP连接缓存数据
redis.del(RedisKey.STOMP_ONLINE_USERS);
log.info("Clear STOMP online user info cache of redis.");
registry.setPreservePublishOrder(true);
registry.setUserDestinationPrefix("/user");
registry.setApplicationDestinationPrefixes("/app");
registry
.enableStompBrokerRelay("/topic", "/queue")
.setRelayHost(rabbitmqProperties.getHost())
.setClientLogin(rabbitmqProperties.getUsername())
.setClientPasscode(rabbitmqProperties.getPassword())
.setSystemLogin(rabbitmqProperties.getUsername())
.setSystemPasscode(rabbitmqProperties.getPassword());
log.info("Init RabbitMQ STOMP MessageBroker Success.");
}
@Override
public void configureClientInboundChannel(ChannelRegistration registration) {
registration.interceptors(clientInboundChannelInterceptor);
}
@Override
public void configureClientOutboundChannel(ChannelRegistration registration) {
registration.interceptors(clientOutboundChannelInterceptor);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.car;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yiring.common.util.DictUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.apache.commons.lang3.StringUtils;
/**
* @author tzl
......@@ -25,6 +26,9 @@ import org.apache.commons.lang3.StringUtils;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class CarVo implements Serializable {
@Serial
private static final long serialVersionUID = -1778680629828674385L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键id", example = "1458555485552")
Long id;
......@@ -42,7 +46,7 @@ public class CarVo implements Serializable {
String carTypeName;
public String getCarTypeName() {
if (StringUtils.isNotBlank(carType)) {
if (StrUtil.isNotBlank(carType)) {
return DictUtils.getDictLabel("car_type", carType);
}
return null;
......@@ -67,7 +71,7 @@ public class CarVo implements Serializable {
String labelCardStatusName;
public String getLabelCardStatusName() {
if (StringUtils.isNotBlank(carType)) {
if (StrUtil.isNotBlank(carType)) {
return DictUtils.getDictLabel("car_label_status", labelCardStatus);
}
return null;
......
/* (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());
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.vo.video;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.awt.*;
import java.io.Serializable;
import lombok.*;
import lombok.experimental.FieldDefaults;
import org.locationtech.jts.geom.Point;
/**
* @author tzl
......@@ -20,13 +22,19 @@ import org.locationtech.jts.geom.Point;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class VideoVo implements Serializable {
@ApiModelProperty(value = "坐标点信息", example = "")
private static final long serialVersionUID = 3968078657827350557L;
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "id", example = "1548548545755")
Long id;
@ApiModelProperty(value = "坐标点", example = "坐标点", required = true)
Point point;
@ApiModelProperty(value = "编号", example = "88888888")
String uuid;
@ApiModelProperty(value = "m3u8地址", example = "")
@ApiModelProperty(value = "m3u8地址", example = "m3u8地址")
String m3u8;
@ApiModelProperty(value = "备注", example = "摄像头")
......
/* (C) 2021 YiRing, Inc. */
package com.yiring.app.web;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson.JSONObject;
import com.yiring.app.constant.Code;
import com.yiring.app.exception.CodeException;
import com.yiring.app.push.domain.PushMessage;
import com.yiring.app.push.service.PushService;
import com.yiring.app.util.GeoUtils;
import com.yiring.common.core.Result;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
......@@ -11,6 +16,7 @@ import java.util.Arrays;
import java.util.List;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Point;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -46,4 +52,12 @@ public class HelloController {
PageVo<String> vo = PageVo.build(data, data.size());
return Result.ok(vo);
}
@GetMapping("test")
public Result<Point> test() {
PushService service = SpringUtil.getBean(PushService.class);
service.push(PushMessage.Type.WS, new JSONObject().fluentPut("msg", "hello"));
Point point = GeoUtils.createPoint(112.1, 23.56);
return Result.ok(point);
}
}
/* (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);
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.app.web.car;
import com.yiring.app.domain.car.Car;
import com.yiring.app.param.car.CarParam;
import com.yiring.app.param.car.CarQueryParam;
import com.yiring.app.service.car.CarService;
import com.yiring.app.vo.car.CarVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.util.poi.ExcelUtils;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 车辆来访信息控制器
......@@ -80,15 +81,9 @@ public class CarController {
return carService.pageCarInfo(carParam);
}
@ApiOperation(value = "导出车辆来访信息")
@ApiOperation(value = "导出车辆来访信息", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@PostMapping("exportCarInfo")
public void exportCarInfo(HttpServletResponse response, @Valid CarQueryParam carParam) {
List<Car> export = carService.export(carParam);
ExcelUtils<Car> util = new ExcelUtils<>(Car.class);
// String fileName = URLEncoder.encode("车辆来访信息.xlsx", StandardCharsets.UTF_8);
response.setContentType("application/octet-stream");
// response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
// response.setCharacterEncoding("utf-8");
util.exportExcel(response, export, "车辆来访信息");
carService.export(carParam, response);
}
}
......@@ -7,21 +7,27 @@ import com.yiring.app.service.video.VideoService;
import com.yiring.app.vo.video.VideoVo;
import com.yiring.common.core.Result;
import com.yiring.common.param.IdParam;
import com.yiring.common.param.PageParam;
import com.yiring.common.vo.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Point;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
* 监控点位控制器
*
* @author tzl
* 2022/4/8 16:51
*/
......@@ -54,14 +60,27 @@ public class VideoController {
}
@ApiOperation(value = "查看监控点位位置")
@PostMapping("selectPoint")
@GetMapping("selectPoint")
public Result<Point> selectPoint(@Valid IdParam idParam) {
return videoService.selectPoint(idParam);
}
@ApiOperation(value = "分页查询监控点位信息")
@PostMapping("pageVideo")
public Result<PageVo<VideoVo>> pageVideo(@Valid VideoQueryParam videoQueryParam, @Valid PageParam param) {
return videoService.pageVideo(videoQueryParam, param);
@GetMapping("pageVideo")
public Result<PageVo<VideoVo>> pageVideo(@Valid VideoQueryParam videoQueryParam) {
return videoService.pageVideo(videoQueryParam);
}
@ApiOperation(value = "导出", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@PostMapping("exportVideo")
public void exportVideo(HttpServletResponse response, @Valid VideoQueryParam videoQueryParam) {
videoService.exportVideo(videoQueryParam, response);
}
@ApiOperation(value = "导入")
@ApiImplicitParams({ @ApiImplicitParam(value = "文件", required = true, name = "file") })
@PostMapping("importVideo")
public Result<String> importVideo(MultipartFile file) {
return videoService.importVideo(file);
}
}
spring:
mvc:
pathmatch:
# 修复 swagger 插件在 2.6.x 接口路径匹配问题
matching-strategy: ant_path_matcher
logging:
level:
# 关闭接口扫描 CachingOperationNameGenerator 日志
springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator: WARN
......@@ -16,6 +16,7 @@ spring:
properties:
hibernate:
format_sql: true
types.print.banner: false
redis:
database: 5
host: ${env.host}
......@@ -24,7 +25,7 @@ spring:
port: 5672
username: admin
password: 123456
virtual-host: /
# knife4j
knife4j:
......@@ -49,3 +50,35 @@ logging:
level:
# sql bind parameter
org.hibernate.type.descriptor.sql.BasicBinder: trace
# 真源定位系统相关配置
zy-config:
host: project.yz-online.com
# RabbitMQ 订阅配置
rabbitmq:
enabled: false
host: ${zy-config.host}
port: 672
username: admin
password: admin
virtual-host: /
queue-name: tenant_msg_${zy-config.open.client-secret}_${zy-config.open.client-id}
# 开放接口信息配置
open:
api: http://${zy-config.host}:789/positionApi
client-id: sc21080400
grant-type: client_credentials
client-secret: 12A14FDC
tenant: sc21080400
# 代理接口信息配置
proxy:
api: https://nl.yz-cloud.com
tenant: ts00000006
# 应用平台账户信息
client:
username: test1234
password: 123456
# 管理后台账户信息
manage:
username: test123
password: test123
......@@ -16,6 +16,7 @@ spring:
properties:
hibernate:
format_sql: true
types.print.banner: false
h2:
console:
enabled: true
......
......@@ -7,7 +7,7 @@ spring:
application:
name: "kshg-api"
profiles:
include: auth
include: auth, conf-patch
active: dev
# DEBUG
......
dependencies {
implementation project(':basic-common:core')
implementation project(':basic-common:util')
implementation project(':basic-common:redis')
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-validation'
// 本地依赖
implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
// swagger annotations
implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
// sa-token
implementation "cn.dev33:sa-token-spring-boot-starter:${saTokenVersion}"
implementation "cn.dev33:sa-token-dao-redis-jackson:${saTokenVersion}"
// hutool-core
// hutool
implementation "cn.hutool:hutool-core:${hutoolVersion}"
implementation "cn.hutool:hutool-json:${hutoolVersion}"
implementation "cn.hutool:hutool-http:${hutoolVersion}"
implementation "cn.hutool:hutool-extra:${hutoolVersion}"
// fastjson
implementation "com.alibaba:fastjson:${fastJsonVersion}"
// myexcel
implementation "com.github.liaochong:myexcel:${myexcelVersion}"
}
......@@ -4,6 +4,7 @@ package com.yiring.auth.domain.dept;
import com.yiring.auth.domain.post.Post;
import com.yiring.auth.domain.user.User;
import com.yiring.common.annotation.FieldMapping;
import java.io.Serial;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Objects;
......@@ -13,7 +14,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......@@ -37,6 +38,7 @@ import org.hibernate.snowflake.SnowflakeId;
@Table(name = "SYS_DEPARTMENT", indexes = { @Index(columnList = "pid"), @Index(columnList = "tree") })
public class Department implements Serializable {
@Serial
private static final long serialVersionUID = -5402731145404250150L;
@Comment("主键")
......
......@@ -3,16 +3,17 @@ package com.yiring.auth.domain.permission;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yiring.common.domain.BasicEntity;
import java.io.Serial;
import java.io.Serializable;
import java.util.Objects;
import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import lombok.experimental.SuperBuilder;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
import org.hibernate.annotations.Comment;
/**
* 权限
......@@ -24,7 +25,7 @@ import org.hibernate.snowflake.SnowflakeId;
@Getter
@Setter
@ToString
@Builder
@SuperBuilder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
......@@ -40,16 +41,11 @@ import org.hibernate.snowflake.SnowflakeId;
@Index(columnList = "uid", unique = true),
}
)
public class Permission implements Serializable {
public class Permission extends BasicEntity implements Serializable {
@Serial
private static final long serialVersionUID = -2001221843529000953L;
@Comment("主键")
@Id
@GeneratedValue(generator = SnowflakeId.GENERATOR)
@GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
Long id;
@Comment("类型(MENU: 菜单, BUTTON: 按钮)")
@Enumerated(EnumType.STRING)
Type type;
......@@ -138,7 +134,7 @@ public class Permission implements Serializable {
if (this == o) return true;
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
Permission that = (Permission) o;
return id != null && Objects.equals(id, that.id);
return this.getId() != null && Objects.equals(this.getId(), that.getId());
}
@Override
......
/* (C) 2022 YiRing, Inc. */
package com.yiring.auth.domain.post;
import java.io.Serial;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
......@@ -9,7 +10,7 @@ import javax.persistence.Table;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
......@@ -33,6 +34,7 @@ import org.hibernate.snowflake.SnowflakeId;
@Table(name = "SYS_POST")
public class Post implements Serializable {
@Serial
private static final long serialVersionUID = 3744892781714515997L;
@Comment("主键")
......
......@@ -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> {}
......@@ -4,6 +4,8 @@ package com.yiring.auth.domain.role;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yiring.auth.domain.permission.Permission;
import com.yiring.auth.domain.user.User;
import com.yiring.common.domain.BasicEntity;
import java.io.Serial;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Objects;
......@@ -12,10 +14,9 @@ import javax.persistence.*;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import lombok.experimental.SuperBuilder;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
import org.hibernate.annotations.Comment;
/**
* 角色
......@@ -27,7 +28,7 @@ import org.hibernate.snowflake.SnowflakeId;
@Getter
@Setter
@ToString
@Builder
@SuperBuilder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
@FieldNameConstants
......@@ -35,16 +36,11 @@ import org.hibernate.snowflake.SnowflakeId;
@Entity
@Comment("系统角色")
@Table(name = "SYS_ROLE", indexes = { @Index(columnList = "uid", unique = true) })
public class Role implements Serializable {
public class Role extends BasicEntity implements Serializable {
@Serial
private static final long serialVersionUID = 910404402503275957L;
@Comment("主键")
@Id
@GeneratedValue(generator = SnowflakeId.GENERATOR)
@GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
Long id;
@Comment("标识")
@Column(unique = true, nullable = false)
String uid;
......@@ -57,7 +53,7 @@ public class Role implements Serializable {
@Comment("权限集合")
@ManyToMany
@ToString.Exclude
private Set<Permission> permissions = new HashSet<>();
Set<Permission> permissions = new HashSet<>();
@JsonIgnore
@EqualsAndHashCode.Exclude
......@@ -70,14 +66,14 @@ public class Role implements Serializable {
joinColumns = { @JoinColumn(name = "role_id") },
inverseJoinColumns = { @JoinColumn(name = "user_id") }
)
private Set<User> users = new HashSet<>();
Set<User> users = new HashSet<>();
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
Role role = (Role) o;
return id != null && Objects.equals(id, role.id);
return this.getId() != null && Objects.equals(this.getId(), role.getId());
}
@Override
......
......@@ -3,9 +3,10 @@ package com.yiring.auth.domain.user;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yiring.auth.domain.dept.Department;
import com.yiring.auth.domain.post.Post;
import com.yiring.auth.domain.role.Role;
import com.yiring.common.annotation.FieldMapping;
import com.yiring.common.domain.BasicEntity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.HashSet;
......@@ -16,9 +17,7 @@ import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants;
import org.hibernate.Hibernate;
import org.hibernate.annotaions.Comment;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.snowflake.SnowflakeId;
import org.hibernate.annotations.Comment;
/**
* 用户
......@@ -39,7 +38,6 @@ import org.hibernate.snowflake.SnowflakeId;
@Table(
name = "SYS_USER",
indexes = {
@Index(columnList = "uuid", unique = true),
@Index(columnList = "mobile", unique = true),
@Index(columnList = "username", unique = true),
@Index(columnList = "email", unique = true),
......@@ -48,16 +46,11 @@ import org.hibernate.snowflake.SnowflakeId;
}
)
@Comment("系统用户")
public class User implements Serializable {
public class User extends BasicEntity implements Serializable {
@Serial
private static final long serialVersionUID = -5787847701210907511L;
@Comment("主键")
@Id
@GeneratedValue(generator = SnowflakeId.GENERATOR)
@GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
Long id;
/**
* 数据来源于【真源人员定位系统 - 定位信标】
* 作用: 用于双向联动进行数据同步
......@@ -97,17 +90,6 @@ public class User implements Serializable {
@Comment("头像")
String avatar;
@Comment("职称")
String title;
@Comment("岗位")
@ManyToOne
@JoinColumn(name = "post_id")
Post post;
@Comment("性别(1: 男, 2: 女)")
Integer gender;
@Comment("是否启用")
Boolean enabled;
......@@ -148,12 +130,6 @@ public class User implements Serializable {
@Comment("最后登录时间")
LocalDateTime lastLoginTime;
@Comment("更新时间")
LocalDateTime updateTime;
@Comment("创建时间")
LocalDateTime createTime;
@SuppressWarnings({ "unused" })
public enum Type {
EMPLOYEES("员工"),
......@@ -194,7 +170,7 @@ public class User implements Serializable {
if (this == o) return true;
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
User user = (User) o;
return id != null && Objects.equals(id, user.id);
return getId() != null && Objects.equals(getId(), user.getId());
}
@Override
......
/* (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());
}
}
......@@ -3,6 +3,7 @@ package com.yiring.auth.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Set;
......@@ -28,6 +29,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class IdsParam implements Serializable {
@Serial
private static final long serialVersionUID = -8379896695668632733L;
@ApiModelProperty(value = "ids 多个以逗号分割", example = "1,2", required = true)
......
......@@ -3,6 +3,7 @@ package com.yiring.auth.param.auth;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
......@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class LoginParam implements Serializable {
@Serial
private static final long serialVersionUID = -8690942241103456895L;
@ApiModelProperty(value = "账号(支持用户名/手机号/邮箱)", example = "admin", required = true)
......
......@@ -3,6 +3,7 @@ package com.yiring.auth.param.auth;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
......@@ -24,6 +25,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class RegisterParam implements Serializable {
@Serial
private static final long serialVersionUID = -8690942241103456895L;
@ApiModelProperty(value = "用户名", example = "admin", required = true)
......
......@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.yiring.auth.domain.permission.Permission;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
......@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class PermissionParam implements Serializable {
@Serial
private static final long serialVersionUID = -6781934969837655538L;
@ApiModelProperty(value = "权限类型", example = "MENU", required = true)
......
/* (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;
}
/* (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();
}
}
......@@ -3,6 +3,7 @@ package com.yiring.auth.param.role;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serial;
import java.io.Serializable;
import javax.validation.constraints.NotEmpty;
import lombok.*;
......@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE)
public class RoleParam implements Serializable {
@Serial
private static final long serialVersionUID = 6572751635422870217L;
@ApiModelProperty(value = "标识", example = "admin", required = true)
......
/* (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);
}
/* (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();
};
}
}
/* (C) 2022 YiRing, Inc. */
package com.yiring.auth.util;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import com.yiring.auth.domain.user.User;
import com.yiring.auth.domain.user.UserRepository;
import com.yiring.common.core.Status;
import java.util.Objects;
import java.util.Optional;
import javax.annotation.Resource;
import lombok.NonNull;
import org.springframework.stereotype.Component;
/**
* 认证工具类
*
* @author Jim
* @version 0.1
* 2022/4/8 17:34
*/
@SuppressWarnings("unused")
@Component
public class Auths {
@Resource
UserRepository userRepository;
/**
* 根据 Token 获取用户信息
* 如果用户未登录或校验失败会抛出 NotLoginException {@link Status#UNAUTHORIZED}
* @param token token
* @return 用户信息
*/
public User getUserByToken(@NonNull String token) {
Object id = StpUtil.getLoginIdByToken(token);
if (id == null) {
StpUtil.logoutByTokenValue(token);
throw NotLoginException.newInstance(StpUtil.TYPE, null);
}
Optional<User> optional = userRepository.findById(Long.valueOf(Objects.toString(id)));
if (optional.isEmpty()) {
StpUtil.logout(id);
throw NotLoginException.newInstance(StpUtil.TYPE, NotLoginException.INVALID_TOKEN);
}
return optional.get();
}
/**
* 获取当前登录用户
* 如果用户未登录会抛出 NotLoginException {@link Status#UNAUTHORIZED}
*/
public User getLoginUser() {
String token = StpUtil.getTokenValue();
if (token == null) {
throw NotLoginException.newInstance(StpUtil.TYPE, null);
}
return getUserByToken(token);
}
}
/* (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();
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论