Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 61ca0fca
由
LN
编写于
2022-05-16 11:28:37 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
记录接口req
1 个父辈
93112ff2
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
41 行增加
和
18 行删除
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
src/main/java/com/neotel/smfcore/hikvision/HikConfig.java
src/main/java/com/neotel/smfcore/hikvision/HikApi.java
查看文件 @
61ca0fc
...
@@ -42,25 +42,11 @@ public class HikApi {
...
@@ -42,25 +42,11 @@ public class HikApi {
*/
*/
public
static
final
int
CODE_ERROR
=
99
;
public
static
final
int
CODE_ERROR
=
99
;
private
static
Integer
currReqCodeNum
=
10000000
;
/**
* 获取请求号
* @return
*/
private
static
String
getReqCode
()
{
String
id
=
""
;
SimpleDateFormat
sf
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
String
temp
=
sf
.
format
(
new
Date
());
id
=
temp
+
codeAdd
();
return
id
;
}
private
static
synchronized
String
codeAdd
(){
currReqCodeNum
++;
return
currReqCodeNum
.
toString
();
}
private
static
String
getReqCode
(){
return
config
.
getReqCode
();
}
public
static
String
getUrl
(
String
apiAddr
,
String
apiName
){
public
static
String
getUrl
(
String
apiAddr
,
String
apiName
){
if
(
ObjectUtil
.
isNotEmpty
(
apiAddr
)){
if
(
ObjectUtil
.
isNotEmpty
(
apiAddr
)){
return
apiAddr
;
return
apiAddr
;
...
...
src/main/java/com/neotel/smfcore/hikvision/HikConfig.java
查看文件 @
61ca0fc
package
com
.
neotel
.
smfcore
.
hikvision
;
package
com
.
neotel
.
smfcore
.
hikvision
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.neotel.smfcore.core.device.util.DataCache
;
import
com.neotel.smfcore.core.device.util.DataCache
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -7,6 +8,8 @@ import org.springframework.beans.factory.annotation.Value;
...
@@ -7,6 +8,8 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PostConstruct
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
@Service
@Service
@Slf4j
@Slf4j
...
@@ -169,8 +172,42 @@ public class HikConfig {
...
@@ -169,8 +172,42 @@ public class HikConfig {
addr_10_reservedOrderApi
=
dataCache
.
GetConfigCache
(
"hik.addr_10_reservedOrderApi"
,
"hik.addr_10_reservedOrderApi"
,
addr_10_reservedOrderApi
);
addr_10_reservedOrderApi
=
dataCache
.
GetConfigCache
(
"hik.addr_10_reservedOrderApi"
,
"hik.addr_10_reservedOrderApi"
,
addr_10_reservedOrderApi
);
addr_11_orderEndApi
=
dataCache
.
GetConfigCache
(
"hik.addr_11_orderEndApi"
,
"hik.addr_11_orderEndApi"
,
addr_11_orderEndApi
);
addr_11_orderEndApi
=
dataCache
.
GetConfigCache
(
"hik.addr_11_orderEndApi"
,
"hik.addr_11_orderEndApi"
,
addr_11_orderEndApi
);
log
.
info
(
"HIK服务器地址:"
+
mesServer
+
",baseCode="
+
baseCode
+
",lgort="
+
lgort
);
try
{
String
cacheCode
=
dataCache
.
getCache
(
"hikapi_req"
);
if
(
ObjectUtil
.
isEmpty
(
cacheCode
))
{
currReqCodeNum
=
10000000
;
}
else
{
SimpleDateFormat
sf
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
String
temp
=
sf
.
format
(
new
Date
());
if
(
cacheCode
.
startsWith
(
temp
))
{
String
str
=
cacheCode
.
substring
(
14
,
cacheCode
.
length
());
currReqCodeNum
=
Integer
.
parseInt
(
str
);
}
}
}
catch
(
Exception
ex
)
{
log
.
info
(
"加载req出错:"
+
ex
);
}
log
.
info
(
"HIK服务器地址:"
+
mesServer
+
",baseCode="
+
baseCode
+
",lgort="
+
lgort
+
",currReqCodeNum="
+
currReqCodeNum
);
}
private
Integer
currReqCodeNum
=
10000000
;
/**
* 获取请求号
* @return
*/
public
String
getReqCode
()
{
String
id
=
""
;
SimpleDateFormat
sf
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
String
temp
=
sf
.
format
(
new
Date
());
id
=
temp
+
codeAdd
();
dataCache
.
updateCache
(
"hikapi_req"
,
id
);
return
id
;
}
}
private
synchronized
String
codeAdd
(){
currReqCodeNum
++;
return
currReqCodeNum
.
toString
();
}
}
}
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论