Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
refined-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
refined-platform
Commits
fa3d27ac
Commit
fa3d27ac
authored
Apr 16, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加同步预约和注册用户类
parent
d83cebef
Changes
15
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
2032 additions
and
1393 deletions
+2032
-1393
db/module.sql
db/module.sql
+5
-0
doc/精细化管理系统.docx
doc/精细化管理系统.docx
+0
-0
refined-manager/src/main/java/com/mortals/xhx/common/code/HikAbilityEnum.java
...main/java/com/mortals/xhx/common/code/HikAbilityEnum.java
+64
-0
refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java
...in/java/com/mortals/xhx/common/code/HikEventTypeEnum.java
+12
-11
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java
...ortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java
+2
-3
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java
.../mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java
+1
-1
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java
...com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java
+6
-5
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
...in/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
+1
-1
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java
...va/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java
+3
-1
refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
...n/java/com/mortals/xhx/module/hik/AbstractHikService.java
+0
-1
refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java
...hx/module/hik/event/service/impl/HikEventServiceImpl.java
+21
-28
refined-manager/src/main/java/com/mortals/xhx/module/monitor/web/MonitorAlarmController.java
...ortals/xhx/module/monitor/web/MonitorAlarmController.java
+0
-2
refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowEntity.java
...als/xhx/module/realtime/model/RealtimeDataflowEntity.java
+200
-115
refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowQuery.java
...tals/xhx/module/realtime/model/RealtimeDataflowQuery.java
+930
-612
refined-manager/src/main/resources/sqlmap/module/realtime/RealtimeDataflowMapper.xml
...sources/sqlmap/module/realtime/RealtimeDataflowMapper.xml
+787
-613
No files found.
db/module.sql
View file @
fa3d27ac
...
@@ -16,12 +16,17 @@ CREATE TABLE mortals_xhx_realtime_dataflow(
...
@@ -16,12 +16,17 @@ CREATE TABLE mortals_xhx_realtime_dataflow(
`queueNum`
varchar
(
255
)
NOT
NULL
COMMENT
'排队编码'
,
`queueNum`
varchar
(
255
)
NOT
NULL
COMMENT
'排队编码'
,
`location`
varchar
(
255
)
NOT
NULL
COMMENT
'办理位置'
,
`location`
varchar
(
255
)
NOT
NULL
COMMENT
'办理位置'
,
`picture`
varchar
(
255
)
COMMENT
'识别截图'
,
`picture`
varchar
(
255
)
COMMENT
'识别截图'
,
`picUri`
varchar
(
255
)
COMMENT
'相对图片pic'
,
`serverIndexCode`
varchar
(
255
)
COMMENT
'图片资源唯一标识'
,
`eventId`
varchar
(
255
)
COMMENT
'事件id'
,
`eventType`
bigint
(
20
)
NOT
NULL
COMMENT
'事件类型'
,
`createTime`
datetime
COMMENT
'创建时间'
,
`createTime`
datetime
COMMENT
'创建时间'
,
`createUserId`
bigint
(
20
)
COMMENT
'创建人id'
,
`createUserId`
bigint
(
20
)
COMMENT
'创建人id'
,
`updateTime`
datetime
COMMENT
'更新时间'
,
`updateTime`
datetime
COMMENT
'更新时间'
,
`updateUserId`
bigint
(
20
)
COMMENT
'更新人id'
,
`updateUserId`
bigint
(
20
)
COMMENT
'更新人id'
,
PRIMARY
KEY
(
`id`
)
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'人员发现记录'
;
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'人员发现记录'
;
-- ----------------------------
-- ----------------------------
-- 预约签到记录表
-- 预约签到记录表
-- ----------------------------
-- ----------------------------
...
...
doc/精细化管理系统.docx
View file @
fa3d27ac
No preview for this file type
refined-manager/src/main/java/com/mortals/xhx/common/code/HikAbilityEnum.java
0 → 100644
View file @
fa3d27ac
package
com.mortals.xhx.common.code
;
import
java.util.LinkedHashMap
;
import
java.util.Map
;
/**
* 海康事件类型
*
* @author zxfei
*/
public
enum
HikAbilityEnum
{
人脸识别事件
(
"event_face_recognition"
,
"人脸识别事件"
);
private
String
value
;
private
String
desc
;
HikAbilityEnum
(
String
value
,
String
desc
)
{
this
.
value
=
value
;
this
.
desc
=
desc
;
}
public
String
getValue
()
{
return
this
.
value
;
}
public
String
getDesc
()
{
return
this
.
desc
;
}
public
static
HikAbilityEnum
getByValue
(
String
value
)
{
for
(
HikAbilityEnum
recognitionPlanTypeEnum
:
HikAbilityEnum
.
values
())
{
if
(
recognitionPlanTypeEnum
.
getValue
()
==
value
)
{
return
recognitionPlanTypeEnum
;
}
}
return
null
;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public
static
Map
<
String
,
String
>
getEnumMap
(
String
...
eItem
)
{
Map
<
String
,
String
>
resultMap
=
new
LinkedHashMap
<>();
for
(
HikAbilityEnum
item
:
HikAbilityEnum
.
values
())
{
try
{
boolean
hasE
=
false
;
for
(
String
e
:
eItem
)
{
if
(
item
.
getValue
()
==
e
)
{
hasE
=
true
;
break
;
}
}
if
(!
hasE
)
{
resultMap
.
put
(
item
.
getValue
()
+
""
,
item
.
getDesc
());
}
}
catch
(
Exception
ex
)
{
}
}
return
resultMap
;
}
}
\ No newline at end of file
refined-manager/src/main/java/com/mortals/xhx/common/code/HikEventTypeEnum.java
View file @
fa3d27ac
...
@@ -4,21 +4,22 @@ import java.util.LinkedHashMap;
...
@@ -4,21 +4,22 @@ import java.util.LinkedHashMap;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
*
海康事件类型
*
周五是否监测(0.否,1.是)枚举类
*
*
* @author zxfei
* @author zxfei
*/
*/
public
enum
HikEventTypeEnum
{
public
enum
HikEventTypeEnum
{
重点人员识别事件
(
"event_face_recognition"
,
"重点人员识别事件"
);
重点人员识别事件
(
1644175361
,
"重点人员识别事件"
),
private
String
value
;
陌生人员识别事件
(
1644171265
,
"陌生人员识别事件"
);
private
Integer
value
;
private
String
desc
;
private
String
desc
;
HikEventTypeEnum
(
String
value
,
String
desc
)
{
HikEventTypeEnum
(
Integer
value
,
String
desc
)
{
this
.
value
=
value
;
this
.
value
=
value
;
this
.
desc
=
desc
;
this
.
desc
=
desc
;
}
}
public
String
getValue
()
{
public
Integer
getValue
()
{
return
this
.
value
;
return
this
.
value
;
}
}
...
@@ -26,10 +27,10 @@ public enum HikEventTypeEnum {
...
@@ -26,10 +27,10 @@ public enum HikEventTypeEnum {
return
this
.
desc
;
return
this
.
desc
;
}
}
public
static
HikEventTypeEnum
getByValue
(
String
value
)
{
public
static
HikEventTypeEnum
getByValue
(
Integer
value
)
{
for
(
HikEventTypeEnum
recognitionPlanType
Enum
:
HikEventTypeEnum
.
values
())
{
for
(
HikEventTypeEnum
friday
Enum
:
HikEventTypeEnum
.
values
())
{
if
(
recognitionPlanType
Enum
.
getValue
()
==
value
)
{
if
(
friday
Enum
.
getValue
()
==
value
)
{
return
recognitionPlanType
Enum
;
return
friday
Enum
;
}
}
}
}
return
null
;
return
null
;
...
@@ -41,12 +42,12 @@ public enum HikEventTypeEnum {
...
@@ -41,12 +42,12 @@ public enum HikEventTypeEnum {
* @param eItem 不包含项
* @param eItem 不包含项
* @return
* @return
*/
*/
public
static
Map
<
String
,
String
>
getEnumMap
(
String
...
eItem
)
{
public
static
Map
<
String
,
String
>
getEnumMap
(
Integer
...
eItem
)
{
Map
<
String
,
String
>
resultMap
=
new
LinkedHashMap
<>();
Map
<
String
,
String
>
resultMap
=
new
LinkedHashMap
<>();
for
(
HikEventTypeEnum
item
:
HikEventTypeEnum
.
values
())
{
for
(
HikEventTypeEnum
item
:
HikEventTypeEnum
.
values
())
{
try
{
try
{
boolean
hasE
=
false
;
boolean
hasE
=
false
;
for
(
String
e
:
eItem
)
{
for
(
Integer
e
:
eItem
)
{
if
(
item
.
getValue
()
==
e
)
{
if
(
item
.
getValue
()
==
e
)
{
hasE
=
true
;
hasE
=
true
;
break
;
break
;
...
...
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java
View file @
fa3d27ac
...
@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
...
@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
/**
/**
* 同步预约人数。
* 同步预约人数。
* 定时每日执行,执行前删除当天已经同步的预约人
*/
*/
@Slf4j
@Slf4j
@Service
(
"SyncAppointmentPersonTask"
)
@Service
(
"SyncAppointmentPersonTask"
)
...
@@ -93,7 +94,6 @@ public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
...
@@ -93,7 +94,6 @@ public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
if
(
restTotal
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
if
(
restTotal
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
//同步今天预约用户
//同步今天预约用户
List
<
AppointmentDataItem
>
appointUserList
=
restTotal
.
getData
().
getData
();
List
<
AppointmentDataItem
>
appointUserList
=
restTotal
.
getData
().
getData
();
log
.
info
(
"预约用户总数量:{}"
,
appointUserList
.
size
());
log
.
info
(
"预约用户总数量:{}"
,
appointUserList
.
size
());
if
(!
ObjectUtils
.
isEmpty
(
appointUserList
))
{
if
(!
ObjectUtils
.
isEmpty
(
appointUserList
))
{
//查询今天添加的预约 并删除
//查询今天添加的预约 并删除
...
@@ -124,9 +124,8 @@ public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
...
@@ -124,9 +124,8 @@ public class SyncAppointmentPersonTaskImpl implements ITaskExcuteService {
return
appointmentPersonEntity
;
return
appointmentPersonEntity
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
newUserList
))
{
if
(!
ObjectUtils
.
isEmpty
(
newUserList
))
{
log
.
info
(
"
注册
用户新增,size:{}"
,
newUserList
.
size
());
log
.
info
(
"
预约
用户新增,size:{}"
,
newUserList
.
size
());
appointmentPersonService
.
save
(
newUserList
);
appointmentPersonService
.
save
(
newUserList
);
}
}
}
}
...
...
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserPicTaskImpl.java
View file @
fa3d27ac
...
@@ -29,7 +29,7 @@ import java.util.List;
...
@@ -29,7 +29,7 @@ import java.util.List;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
/**
/**
* 同步注册用户
与预约人数
。
* 同步注册用户
的证件照片
。
*/
*/
@Slf4j
@Slf4j
@Service
(
"SyncRegisterUserPicTask"
)
@Service
(
"SyncRegisterUserPicTask"
)
...
...
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncRegisterUserTaskImpl.java
View file @
fa3d27ac
...
@@ -57,7 +57,8 @@ import java.util.Map;
...
@@ -57,7 +57,8 @@ import java.util.Map;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
/**
/**
* 同步注册用户与预约人数。
* 同步注册用户。
* 定时以一定时间间隔进行人员获取 定时时间要早于每日预约人数的同步时间
*/
*/
@Slf4j
@Slf4j
@Service
(
"SyncRegisterUserTask"
)
@Service
(
"SyncRegisterUserTask"
)
...
@@ -181,10 +182,10 @@ public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
...
@@ -181,10 +182,10 @@ public class SyncRegisterUserTaskImpl implements ITaskExcuteService {
personService
.
save
(
saveUserList
);
personService
.
save
(
saveUserList
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
delUserList
))
{
//
if (!ObjectUtils.isEmpty(delUserList)) {
log
.
info
(
"注册用户删除,size:{}"
,
delUserList
.
size
());
//
log.info("注册用户删除,size:{}", delUserList.size());
personService
.
remove
(
delUserList
,
null
);
//
personService.remove(delUserList, null);
}
//
}
}
}
...
...
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @
fa3d27ac
...
@@ -22,7 +22,7 @@ import org.springframework.util.ObjectUtils;
...
@@ -22,7 +22,7 @@ import org.springframework.util.ObjectUtils;
import
java.util.List
;
import
java.util.List
;
/**
/**
* 同步用户,唯一标识为用户名。
* 同步
门户
用户,唯一标识为用户名。
*/
*/
@Slf4j
@Slf4j
@Service
(
"SyncUserTask"
)
@Service
(
"SyncUserTask"
)
...
...
refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java
View file @
fa3d27ac
...
@@ -41,7 +41,9 @@ import java.util.Date;
...
@@ -41,7 +41,9 @@ import java.util.Date;
import
java.util.List
;
import
java.util.List
;
/**
/**
* 同步用户到海康指定库。
* 同步用户人脸数据到海康指定库。
* 时间间隔以同步注册用户之后
* 默认同步到一个人脸用户组,如要其它用户组 则页面上进行添加
*/
*/
@Slf4j
@Slf4j
@Service
(
"SyncUserToHikTask"
)
@Service
(
"SyncUserToHikTask"
)
...
...
refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
View file @
fa3d27ac
...
@@ -17,7 +17,6 @@ public abstract class AbstractHikService {
...
@@ -17,7 +17,6 @@ public abstract class AbstractHikService {
@Value
(
"${hik.appSecret:''}"
)
@Value
(
"${hik.appSecret:''}"
)
protected
String
appSecret
;
protected
String
appSecret
;
@Value
(
"${hik.protocol:http://}"
)
@Value
(
"${hik.protocol:http://}"
)
protected
String
protocol
;
protected
String
protocol
;
...
...
refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java
View file @
fa3d27ac
...
@@ -7,6 +7,7 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig;
...
@@ -7,6 +7,7 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.util.DataUtil
;
import
com.mortals.framework.util.DataUtil
;
import
com.mortals.xhx.common.code.HikAbilityEnum
;
import
com.mortals.xhx.common.code.HikEventTypeEnum
;
import
com.mortals.xhx.common.code.HikEventTypeEnum
;
import
com.mortals.xhx.common.key.ParamKey
;
import
com.mortals.xhx.common.key.ParamKey
;
import
com.mortals.xhx.module.hik.AbstractHikService
;
import
com.mortals.xhx.module.hik.AbstractHikService
;
...
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
...
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
/**
* 海康人员接口类
* 海康人员接口类
...
@@ -111,35 +113,34 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
...
@@ -111,35 +113,34 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
//String similarity = GlobalSysInfo.getParamValue(ParamKey.PARAM_FACE_SIMILARITY, "0.8");
//String similarity = GlobalSysInfo.getParamValue(ParamKey.PARAM_FACE_SIMILARITY, "0.8");
Params
params
=
req
.
getParams
();
Params
params
=
req
.
getParams
();
if
(
HikEventTypeEnum
.
重点人员识别事件
.
getValue
().
equals
(
params
.
getAbility
()))
{
if
(
HikAbilityEnum
.
人脸识别事件
.
getValue
().
equals
(
params
.
getAbility
()))
{
params
.
getEvents
();
for
(
EventsItem
event
:
params
.
getEvents
())
{
for
(
EventsItem
event
:
params
.
getEvents
())
{
//事件详细
String
eventId
=
event
.
getEventId
();
int
eventType
=
event
.
getEventType
();
EventData
eventData
=
event
.
getData
();
EventData
eventData
=
event
.
getData
();
//识别结果
//识别结果
FaceRecognitionResult
faceRecognitionResult
=
eventData
.
getFaceRecognitionResult
();
FaceRecognitionResult
faceRecognitionResult
=
eventData
.
getFaceRecognitionResult
();
//抓拍信息
//抓拍信息
Snap
snap
=
faceRecognitionResult
.
getSnap
();
Snap
snap
=
faceRecognitionResult
.
getSnap
();
if
(
HikEventTypeEnum
.
重点人员识别事件
.
getValue
()
==
event
.
getEventType
())
{
//处理重点人员事件
//匹配的结果
//匹配的结果
List
<
FaceMatchItem
>
faceMatchs
=
faceRecognitionResult
.
getFaceMatch
();
List
<
FaceMatchItem
>
faceMatchs
=
faceRecognitionResult
.
getFaceMatch
();
for
(
FaceMatchItem
faceMatch
:
faceMatchs
)
{
for
(
FaceMatchItem
faceMatch
:
faceMatchs
)
{
//根据匹配结果 保存业务数据 todo
if
(
faceMatch
.
getSimilarity
()
>
similarity
)
{
//保存当前识别结果到记录表中
}
}
}
else
if
(
HikEventTypeEnum
.
陌生人员识别事件
.
getValue
()
==
event
.
getEventType
())
{
//不论识别结果 保存流量数据
//不论识别结果 保存流量数据
RealtimeDataflowEntity
realtimeDataflowEntity
=
new
RealtimeDataflowEntity
();
RealtimeDataflowEntity
realtimeDataflowEntity
=
new
RealtimeDataflowEntity
();
realtimeDataflowEntity
.
setDetectTime
(
event
.
getHappenTime
());
String
resIndexCodes
=
eventData
.
getResInfo
().
stream
().
map
(
i
->
i
.
getIndexCode
()).
collect
(
Collectors
.
joining
(
","
));
realtimeDataflowEntity
.
setDevice
(
resIndexCodes
);
realtimeDataflowEntity
.
setPicUri
(
eventData
.
getFaceRecognitionResult
().
getSnap
().
getFaceUrl
());
realtimeDataflowEntity
.
setEventId
(
event
.
getEventId
());
realtimeDataflowEntity
.
setEventType
(
HikEventTypeEnum
.
陌生人员识别事件
.
getValue
().
longValue
());
// realtimeDataflowEntity.setPersonId();
// realtimeDataflowEntity.setName();
// realtimeDataflowEntity.setDevice();
// realtimeDataflowEntity.setDetectTime();
// realtimeDataflowEntity.setContact();
// realtimeDataflowEntity.setIdNumber();
// realtimeDataflowEntity.setIsBooking();
// realtimeDataflowEntity.setQueueNum();
// realtimeDataflowEntity.setLocation();
// realtimeDataflowEntity.setPicture();
// realtimeDataflowEntity.setOrderCols();
// realtimeDataflowEntity.setOrderColList();
realtimeDataflowEntity
.
setCreateUserId
(
1L
);
realtimeDataflowEntity
.
setCreateUserId
(
1L
);
realtimeDataflowEntity
.
setCreateTime
(
new
Date
());
realtimeDataflowEntity
.
setCreateTime
(
new
Date
());
...
@@ -149,14 +150,6 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
...
@@ -149,14 +150,6 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
realtimeDataflowEntity
.
initAttrValue
();
realtimeDataflowEntity
.
initAttrValue
();
//dataflowService.save()
//dataflowService.save()
//根据匹配结果 保存业务数据 todo
if
(
faceMatch
.
getSimilarity
()>
similarity
){
//保存当前识别结果到记录表中
}
else
{
//识别为陌生人 保存
}
}
}
...
...
refined-manager/src/main/java/com/mortals/xhx/module/monitor/web/MonitorAlarmController.java
View file @
fa3d27ac
...
@@ -33,8 +33,6 @@ import static com.mortals.framework.ap.SysConstains.*;
...
@@ -33,8 +33,6 @@ import static com.mortals.framework.ap.SysConstains.*;
@RequestMapping
(
"monitor/alarm"
)
@RequestMapping
(
"monitor/alarm"
)
public
class
MonitorAlarmController
extends
BaseCRUDJsonBodyMappingController
<
MonitorAlarmService
,
MonitorAlarmEntity
,
Long
>
{
public
class
MonitorAlarmController
extends
BaseCRUDJsonBodyMappingController
<
MonitorAlarmService
,
MonitorAlarmEntity
,
Long
>
{
@Autowired
private
ParamService
paramService
;
public
MonitorAlarmController
(){
public
MonitorAlarmController
(){
super
.
setModuleDesc
(
"监测预警记录"
);
super
.
setModuleDesc
(
"监测预警记录"
);
...
...
refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowEntity.java
View file @
fa3d27ac
...
@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
...
@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.realtime.model.vo.RealtimeDataflowVo
;
import
com.mortals.xhx.module.realtime.model.vo.RealtimeDataflowVo
;
/**
/**
* 人员发现记录实体对象
* 人员发现记录实体对象
*
*
* @author zxfei
* @author zxfei
* @date 2023-04-09
* @date 2023-04-16
*/
*/
public
class
RealtimeDataflowEntity
extends
RealtimeDataflowVo
{
public
class
RealtimeDataflowEntity
extends
RealtimeDataflowVo
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -75,6 +75,23 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
...
@@ -75,6 +75,23 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
*/
*/
@Excel
(
name
=
"识别截图"
)
@Excel
(
name
=
"识别截图"
)
private
String
picture
;
private
String
picture
;
/**
* 相对图片pic
*/
private
String
picUri
;
/**
* 图片资源唯一标识
*/
private
String
serverIndexCode
;
/**
* 事件id
*/
private
String
eventId
;
/**
* 事件类型
*/
@Excel
(
name
=
"事件类型"
)
private
Long
eventType
;
...
@@ -247,6 +264,62 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
...
@@ -247,6 +264,62 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
public
void
setPicture
(
String
picture
){
public
void
setPicture
(
String
picture
){
this
.
picture
=
picture
;
this
.
picture
=
picture
;
}
}
/**
* 获取 相对图片pic
* @return String
*/
public
String
getPicUri
(){
return
picUri
;
}
/**
* 设置 相对图片pic
* @param picUri
*/
public
void
setPicUri
(
String
picUri
){
this
.
picUri
=
picUri
;
}
/**
* 获取 图片资源唯一标识
* @return String
*/
public
String
getServerIndexCode
(){
return
serverIndexCode
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public
void
setServerIndexCode
(
String
serverIndexCode
){
this
.
serverIndexCode
=
serverIndexCode
;
}
/**
* 获取 事件id
* @return String
*/
public
String
getEventId
(){
return
eventId
;
}
/**
* 设置 事件id
* @param eventId
*/
public
void
setEventId
(
String
eventId
){
this
.
eventId
=
eventId
;
}
/**
* 获取 事件类型
* @return Long
*/
public
Long
getEventType
(){
return
eventType
;
}
/**
* 设置 事件类型
* @param eventType
*/
public
void
setEventType
(
Long
eventType
){
this
.
eventType
=
eventType
;
}
...
@@ -281,6 +354,10 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
...
@@ -281,6 +354,10 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
sb
.
append
(
",queueNum:"
).
append
(
getQueueNum
());
sb
.
append
(
",queueNum:"
).
append
(
getQueueNum
());
sb
.
append
(
",location:"
).
append
(
getLocation
());
sb
.
append
(
",location:"
).
append
(
getLocation
());
sb
.
append
(
",picture:"
).
append
(
getPicture
());
sb
.
append
(
",picture:"
).
append
(
getPicture
());
sb
.
append
(
",picUri:"
).
append
(
getPicUri
());
sb
.
append
(
",serverIndexCode:"
).
append
(
getServerIndexCode
());
sb
.
append
(
",eventId:"
).
append
(
getEventId
());
sb
.
append
(
",eventType:"
).
append
(
getEventType
());
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
@@ -309,5 +386,13 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
...
@@ -309,5 +386,13 @@ public class RealtimeDataflowEntity extends RealtimeDataflowVo {
this
.
location
=
""
;
this
.
location
=
""
;
this
.
picture
=
""
;
this
.
picture
=
""
;
this
.
picUri
=
""
;
this
.
serverIndexCode
=
""
;
this
.
eventId
=
""
;
this
.
eventType
=
null
;
}
}
}
}
\ No newline at end of file
refined-manager/src/main/java/com/mortals/xhx/module/realtime/model/RealtimeDataflowQuery.java
View file @
fa3d27ac
...
@@ -4,11 +4,11 @@ import java.util.Date;
...
@@ -4,11 +4,11 @@ import java.util.Date;
import
java.util.List
;
import
java.util.List
;
import
com.mortals.xhx.module.realtime.model.RealtimeDataflowEntity
;
import
com.mortals.xhx.module.realtime.model.RealtimeDataflowEntity
;
/**
/**
* 人员发现记录查询对象
* 人员发现记录查询对象
*
*
* @author zxfei
* @author zxfei
* @date 2023-04-09
* @date 2023-04-16
*/
*/
public
class
RealtimeDataflowQuery
extends
RealtimeDataflowEntity
{
public
class
RealtimeDataflowQuery
extends
RealtimeDataflowEntity
{
/** 开始 主键ID,主键,自增长 */
/** 开始 主键ID,主键,自增长 */
private
Long
idStart
;
private
Long
idStart
;
...
@@ -116,6 +116,36 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
...
@@ -116,6 +116,36 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
/** 识别截图排除列表 */
/** 识别截图排除列表 */
private
List
<
String
>
pictureNotList
;
private
List
<
String
>
pictureNotList
;
/** 相对图片pic */
private
List
<
String
>
picUriList
;
/** 相对图片pic排除列表 */
private
List
<
String
>
picUriNotList
;
/** 图片资源唯一标识 */
private
List
<
String
>
serverIndexCodeList
;
/** 图片资源唯一标识排除列表 */
private
List
<
String
>
serverIndexCodeNotList
;
/** 事件id */
private
List
<
String
>
eventIdList
;
/** 事件id排除列表 */
private
List
<
String
>
eventIdNotList
;
/** 开始 事件类型 */
private
Long
eventTypeStart
;
/** 结束 事件类型 */
private
Long
eventTypeEnd
;
/** 增加 事件类型 */
private
Long
eventTypeIncrement
;
/** 事件类型列表 */
private
List
<
Long
>
eventTypeList
;
/** 事件类型排除列表 */
private
List
<
Long
>
eventTypeNotList
;
/** 开始 创建时间 */
/** 开始 创建时间 */
private
String
createTimeStart
;
private
String
createTimeStart
;
...
@@ -778,6 +808,183 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
...
@@ -778,6 +808,183 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
this
.
pictureNotList
=
pictureNotList
;
this
.
pictureNotList
=
pictureNotList
;
}
}
/**
* 获取 相对图片pic
* @return picUriList
*/
public
List
<
String
>
getPicUriList
(){
return
this
.
picUriList
;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public
void
setPicUriList
(
List
<
String
>
picUriList
){
this
.
picUriList
=
picUriList
;
}
/**
* 获取 相对图片pic
* @return picUriNotList
*/
public
List
<
String
>
getPicUriNotList
(){
return
this
.
picUriNotList
;
}
/**
* 设置 相对图片pic
* @param picUriNotList
*/
public
void
setPicUriNotList
(
List
<
String
>
picUriNotList
){
this
.
picUriNotList
=
picUriNotList
;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeList
*/
public
List
<
String
>
getServerIndexCodeList
(){
return
this
.
serverIndexCodeList
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public
void
setServerIndexCodeList
(
List
<
String
>
serverIndexCodeList
){
this
.
serverIndexCodeList
=
serverIndexCodeList
;
}
/**
* 获取 图片资源唯一标识
* @return serverIndexCodeNotList
*/
public
List
<
String
>
getServerIndexCodeNotList
(){
return
this
.
serverIndexCodeNotList
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeNotList
*/
public
void
setServerIndexCodeNotList
(
List
<
String
>
serverIndexCodeNotList
){
this
.
serverIndexCodeNotList
=
serverIndexCodeNotList
;
}
/**
* 获取 事件id
* @return eventIdList
*/
public
List
<
String
>
getEventIdList
(){
return
this
.
eventIdList
;
}
/**
* 设置 事件id
* @param eventIdList
*/
public
void
setEventIdList
(
List
<
String
>
eventIdList
){
this
.
eventIdList
=
eventIdList
;
}
/**
* 获取 事件id
* @return eventIdNotList
*/
public
List
<
String
>
getEventIdNotList
(){
return
this
.
eventIdNotList
;
}
/**
* 设置 事件id
* @param eventIdNotList
*/
public
void
setEventIdNotList
(
List
<
String
>
eventIdNotList
){
this
.
eventIdNotList
=
eventIdNotList
;
}
/**
* 获取 开始 事件类型
* @return eventTypeStart
*/
public
Long
getEventTypeStart
(){
return
this
.
eventTypeStart
;
}
/**
* 设置 开始 事件类型
* @param eventTypeStart
*/
public
void
setEventTypeStart
(
Long
eventTypeStart
){
this
.
eventTypeStart
=
eventTypeStart
;
}
/**
* 获取 结束 事件类型
* @return $eventTypeEnd
*/
public
Long
getEventTypeEnd
(){
return
this
.
eventTypeEnd
;
}
/**
* 设置 结束 事件类型
* @param eventTypeEnd
*/
public
void
setEventTypeEnd
(
Long
eventTypeEnd
){
this
.
eventTypeEnd
=
eventTypeEnd
;
}
/**
* 获取 增加 事件类型
* @return eventTypeIncrement
*/
public
Long
getEventTypeIncrement
(){
return
this
.
eventTypeIncrement
;
}
/**
* 设置 增加 事件类型
* @param eventTypeIncrement
*/
public
void
setEventTypeIncrement
(
Long
eventTypeIncrement
){
this
.
eventTypeIncrement
=
eventTypeIncrement
;
}
/**
* 获取 事件类型
* @return eventTypeList
*/
public
List
<
Long
>
getEventTypeList
(){
return
this
.
eventTypeList
;
}
/**
* 设置 事件类型
* @param eventTypeList
*/
public
void
setEventTypeList
(
List
<
Long
>
eventTypeList
){
this
.
eventTypeList
=
eventTypeList
;
}
/**
* 获取 事件类型
* @return eventTypeNotList
*/
public
List
<
Long
>
getEventTypeNotList
(){
return
this
.
eventTypeNotList
;
}
/**
* 设置 事件类型
* @param eventTypeNotList
*/
public
void
setEventTypeNotList
(
List
<
Long
>
eventTypeNotList
){
this
.
eventTypeNotList
=
eventTypeNotList
;
}
/**
/**
* 获取 开始 创建时间
* 获取 开始 创建时间
* @return createTimeStart
* @return createTimeStart
...
@@ -1374,6 +1581,117 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
...
@@ -1374,6 +1581,117 @@ public class RealtimeDataflowQuery extends RealtimeDataflowEntity {
}
}
/**
* 设置 相对图片pic
* @param picUri
*/
public
RealtimeDataflowQuery
picUri
(
String
picUri
){
setPicUri
(
picUri
);
return
this
;
}
/**
* 设置 相对图片pic
* @param picUriList
*/
public
RealtimeDataflowQuery
picUriList
(
List
<
String
>
picUriList
){
this
.
picUriList
=
picUriList
;
return
this
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCode
*/
public
RealtimeDataflowQuery
serverIndexCode
(
String
serverIndexCode
){
setServerIndexCode
(
serverIndexCode
);
return
this
;
}
/**
* 设置 图片资源唯一标识
* @param serverIndexCodeList
*/
public
RealtimeDataflowQuery
serverIndexCodeList
(
List
<
String
>
serverIndexCodeList
){
this
.
serverIndexCodeList
=
serverIndexCodeList
;
return
this
;
}
/**
* 设置 事件id
* @param eventId
*/
public
RealtimeDataflowQuery
eventId
(
String
eventId
){
setEventId
(
eventId
);
return
this
;
}
/**
* 设置 事件id
* @param eventIdList
*/
public
RealtimeDataflowQuery
eventIdList
(
List
<
String
>
eventIdList
){
this
.
eventIdList
=
eventIdList
;
return
this
;
}
/**
* 设置 事件类型
* @param eventType
*/
public
RealtimeDataflowQuery
eventType
(
Long
eventType
){
setEventType
(
eventType
);
return
this
;
}
/**
* 设置 开始 事件类型
* @param eventTypeStart
*/
public
RealtimeDataflowQuery
eventTypeStart
(
Long
eventTypeStart
){
this
.
eventTypeStart
=
eventTypeStart
;
return
this
;
}
/**
* 设置 结束 事件类型
* @param eventTypeEnd
*/
public
RealtimeDataflowQuery
eventTypeEnd
(
Long
eventTypeEnd
){
this
.
eventTypeEnd
=
eventTypeEnd
;
return
this
;
}
/**
* 设置 增加 事件类型
* @param eventTypeIncrement
*/
public
RealtimeDataflowQuery
eventTypeIncrement
(
Long
eventTypeIncrement
){
this
.
eventTypeIncrement
=
eventTypeIncrement
;
return
this
;
}
/**
* 设置 事件类型
* @param eventTypeList
*/
public
RealtimeDataflowQuery
eventTypeList
(
List
<
Long
>
eventTypeList
){
this
.
eventTypeList
=
eventTypeList
;
return
this
;
}
/**
* 设置 事件类型
* @param eventTypeNotList
*/
public
RealtimeDataflowQuery
eventTypeNotList
(
List
<
Long
>
eventTypeNotList
){
this
.
eventTypeNotList
=
eventTypeNotList
;
return
this
;
}
/**
/**
* 设置 创建人id
* 设置 创建人id
* @param createUserId
* @param createUserId
...
...
refined-manager/src/main/resources/sqlmap/module/realtime/RealtimeDataflowMapper.xml
View file @
fa3d27ac
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment