Guwan
/
Guwan-smartSchool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

一码通设备增加发送人员身份证号和人员类型

This commit is contained in:
gaoben 2022-09-20 09:26:06 +08:00
parent ef902b197c
commit d02e78c8ab
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java
View File

@ -353,6 +353,11 @@ public class DeviceApiServiceImpl implements DeviceApiService {
puser.setFace_pic_base64(""); puser.setFace_pic_base64("");
//--------------------------------------一码通设备添加
puser.setIdNumber(p.getIdCard());
puser.setPersonClass(p.getPersonType());
//-----------------------------------------3d数据-------------------------------------- //-----------------------------------------3d数据--------------------------------------
/* /*
"rgb":"url" "rgb":"url"

3
shapelight-admin/src/main/java/net/shapelight/modules/vo/TenUserVo.java
View File

@ -31,5 +31,8 @@ public class TenUserVo {
private String sourceFile; private String sourceFile;
private String cameraParam; private String cameraParam;
private String idNumber;
private Integer personClass;
} }

2
shapelight-admin/src/main/resources/application-dev.yml
View File

@ -3,7 +3,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.50.20:3306/cell_db_v4.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true url: jdbc:mysql://192.168.10.20:3306/cell_db_v4.0_fengdong?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&rewriteBatchedStatements=true
username: user username: user
password: user@server001 password: user@server001
initial-size: 10 initial-size: 10

4
shapelight-admin/src/main/resources/application.yml
View File

@ -32,7 +32,7 @@ spring:
file-size-threshold: 1000MB file-size-threshold: 1000MB
redis: redis:
database: 0 database: 0
host: 192.168.50.20 host: 192.168.10.20
port: 6379 port: 6379
password: 123456 # 密码（默认为空） password: 123456 # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒） timeout: 6000ms # 连接超时时长（毫秒）
@ -84,7 +84,7 @@ global:
db_host: localhost db_host: localhost
db_port: 3306 db_port: 3306
minio: minio:
endpoint: http://192.168.50.20:9000 endpoint: http://192.168.10.20:9000
port: 9000 port: 9000
accessKey: admin accessKey: admin
secretKey: admin@C501 secretKey: admin@C501