Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit f946ddce
由
sunke
编写于
2022-11-01 09:08:25 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
接口异常时间查询不生效修正
1 个父辈
ffe7b1b4
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
11 行增加
和
20 行删除
src/main/java/com/neotel/smfcore/core/hik/rest/InterfaceExceptionController.java
src/main/java/com/neotel/smfcore/core/hik/rest/dto/InterfaceExDto.java
src/main/java/com/neotel/smfcore/core/hik/rest/query/InterfaceExCriteria.java
src/main/java/com/neotel/smfcore/hikvision/HikApiCache.java
src/main/java/com/neotel/smfcore/hikvision/bean/api/HikApiRequest.java
src/main/java/com/neotel/smfcore/hikvision/service/po/HikApiRequestError.java
src/main/java/com/neotel/smfcore/core/hik/rest/InterfaceExceptionController.java
查看文件 @
f946ddc
...
...
@@ -56,9 +56,9 @@ public class InterfaceExceptionController {
private
InterfaceExDto
toDto
(
HikApiRequestError
request
)
{
InterfaceExDto
dto
=
new
InterfaceExDto
();
dto
.
setApiType
(
request
.
getApiType
());
dto
.
setCreate
Time
(
request
.
getCreateTim
e
());
dto
.
setCreate
Date
(
request
.
getCreateDat
e
());
dto
.
setReqCode
(
request
.
getParam
().
getReqCode
());
dto
.
setUpdate
time
(
request
.
getUpdatetim
e
());
dto
.
setUpdate
Date
(
request
.
getUpdateDat
e
());
dto
.
setUserCode
(
request
.
getParam
().
getUserCode
());
dto
.
setData
(
JsonUtil
.
toJsonStr
(
request
.
getParam
().
getData
())
);
dto
.
setResponseCode
(
request
.
getResponseParam
().
getCode
());
...
...
src/main/java/com/neotel/smfcore/core/hik/rest/dto/InterfaceExDto.java
查看文件 @
f946ddc
...
...
@@ -40,10 +40,10 @@ public class InterfaceExDto implements Serializable {
private
String
data
;
@ApiModelProperty
(
"创建时间"
)
private
Date
create
Tim
e
;
private
Date
create
Dat
e
;
@ApiModelProperty
(
"更新时间"
)
private
Date
update
tim
e
;
private
Date
update
Dat
e
;
@ApiModelProperty
(
"接口返回结果:0-成功,1~N-失败"
)
private
Integer
responseCode
=-
1
;
...
...
src/main/java/com/neotel/smfcore/core/hik/rest/query/InterfaceExCriteria.java
查看文件 @
f946ddc
...
...
@@ -5,7 +5,8 @@ import com.neotel.smfcore.common.bean.BetweenData;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.sql.Date
;
import
java.util.Date
;
@Data
public
class
InterfaceExCriteria
{
@QueryCondition
(
blurry
=
"param.reqCode,param.userCode,param.data,responseParam.message,responseParam.data"
)
...
...
src/main/java/com/neotel/smfcore/hikvision/HikApiCache.java
查看文件 @
f946ddc
...
...
@@ -56,8 +56,8 @@ public class HikApiCache {
requestError
.
setKey
(
dbRequest
.
getKey
());
requestError
.
setSecret
(
dbRequest
.
getSecret
());
requestError
.
setParam
(
dbRequest
.
getParam
());
requestError
.
setCreate
Time
(
dbRequest
.
getCreateTim
e
());
requestError
.
setUpdate
time
(
dbRequest
.
getUpdatetim
e
());
requestError
.
setCreate
Date
(
dbRequest
.
getCreateDat
e
());
requestError
.
setUpdate
Date
(
dbRequest
.
getUpdateDat
e
());
requestError
.
setResponseParam
(
dbRequest
.
getResponseParam
());
failedList
.
add
(
requestError
);
}
...
...
@@ -77,7 +77,7 @@ public class HikApiCache {
public
static
void
addFailedRequest
(
HikApiRequestError
apiRequest
,
ResponseParam
responseParam
)
{
String
mapKey
=
apiRequest
.
getParam
().
getReqCode
();
apiRequest
.
setResponseParam
(
responseParam
);
apiRequest
.
setUpdate
tim
e
(
new
Date
());
apiRequest
.
setUpdate
Dat
e
(
new
Date
());
HikApiRequestError
dbRequest
=
hikApiRequestErrorDao
.
getByReqCode
(
mapKey
);
if
(
dbRequest
==
null
)
{
log
.
info
(
mapKey
+
"通知指令"
+
mapKey
+
"发送到Hik失败,加入到缓存"
);
...
...
src/main/java/com/neotel/smfcore/hikvision/bean/api/HikApiRequest.java
查看文件 @
f946ddc
...
...
@@ -22,8 +22,8 @@ public class HikApiRequest extends HikApiRequestError {
this
.
key
=
key
;
this
.
secret
=
secret
;
this
.
param
=
param
;
this
.
createTime
=
new
Date
(
);
this
.
updatetime
=
new
Date
(
);
this
.
setCreateDate
(
new
Date
()
);
this
.
setUpdateDate
(
new
Date
()
);
}
public
String
getParamJson
(){
...
...
src/main/java/com/neotel/smfcore/hikvision/service/po/HikApiRequestError.java
查看文件 @
f946ddc
...
...
@@ -47,16 +47,6 @@ public class HikApiRequestError extends BasePo implements Serializable{
protected
RequestParam
param
;
/**
* 消息创建时间
*/
protected
Date
createTime
;
/**
* 最后更新时间
*/
protected
Date
updatetime
;
/**
* 最后一次接口返回值
*/
protected
ResponseParam
responseParam
;
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论