人员出入管理
This commit is contained in:
parent
488f143c20
commit
6239edadfa
|
|
@ -100,7 +100,8 @@ public class AccessMgeServiceImpl implements AccessMgeService {
|
||||||
String base64 = item.getString("url");
|
String base64 = item.getString("url");
|
||||||
vo.setBase64(base64);
|
vo.setBase64(base64);
|
||||||
}
|
}
|
||||||
vo.setPersonName(handleData(vo.getSourceData()));
|
vo.setPersonName(handleData(vo.getSourceData(),"personName"));
|
||||||
|
vo.setAccesssTime(handleData(vo.getSourceData(),"dataTime"));
|
||||||
}
|
}
|
||||||
if(i == 0 || i == 1){
|
if(i == 0 || i == 1){
|
||||||
noWarnList.add(vo);
|
noWarnList.add(vo);
|
||||||
|
|
@ -116,14 +117,14 @@ public class AccessMgeServiceImpl implements AccessMgeService {
|
||||||
return AjaxResult.success(map);
|
return AjaxResult.success(map);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String handleData(String jsonStr){
|
public static String handleData(String jsonStr,String fieldName){
|
||||||
try {
|
try {
|
||||||
if(StringUtils.isEmpty(jsonStr)){
|
if(StringUtils.isEmpty(jsonStr)){
|
||||||
return null;
|
return null;
|
||||||
}else{
|
}else{
|
||||||
JSONObject jsonObject = JSONObject.parseObject(jsonStr);
|
JSONObject jsonObject = JSONObject.parseObject(jsonStr);
|
||||||
String personName = jsonObject.getString("personName");
|
String value = jsonObject.getString(fieldName);
|
||||||
return personName;
|
return value;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("人员出入数据解析异常",e);
|
log.error("人员出入数据解析异常",e);
|
||||||
|
|
|
||||||
|
|
@ -67,13 +67,19 @@
|
||||||
|
|
||||||
<!--人员出入照片-->
|
<!--人员出入照片-->
|
||||||
<select id="getPerStatisticsPhoto" resultType="com.securitycontrol.entity.screen.vo.AccessMgeVo">
|
<select id="getPerStatisticsPhoto" resultType="com.securitycontrol.entity.screen.vo.AccessMgeVo">
|
||||||
SELECT trf.file_id AS val,thdv.create_time AS createTime,thdv.is_warn AS isWarn,thdv.source_data AS sourceData
|
SELECT trf.file_id AS val,thdv.create_time AS createTime,thdv.is_warn AS isWarn,thdv.source_data AS sourceData,a.val AS accesssTime
|
||||||
FROM tb_his_device_value thdv
|
FROM tb_his_device_value thdv
|
||||||
|
INNER JOIN (
|
||||||
|
SELECT thdv.val,thdv.source_type
|
||||||
|
FROM tb_his_device_value thdv
|
||||||
|
INNER JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id AND tdd.del_flag = 0 AND tdd.device_code = 'dataTime'
|
||||||
|
WHERE thdv.bid_code = #{bidCode}
|
||||||
|
) a ON a.source_type = thdv.source_type
|
||||||
INNER JOIN tb_resource_file trf ON thdv.val = trf.source_id AND trf.del_flag = 0 AND trf.source_type = '人员出入'
|
INNER JOIN tb_resource_file trf ON thdv.val = trf.source_id AND trf.del_flag = 0 AND trf.source_type = '人员出入'
|
||||||
INNER JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id AND tdd.del_flag = 0 AND tdd.device_code = #{modeName}
|
INNER JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id AND tdd.del_flag = 0 AND tdd.device_code = #{modeName}
|
||||||
INNER JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id AND tbd.del_flag = 0 AND tbd.devic_type = #{typeCode}
|
INNER JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id AND tbd.del_flag = 0 AND tbd.devic_type = #{typeCode}
|
||||||
WHERE bid_code = #{bidCode}
|
WHERE bid_code = #{bidCode}
|
||||||
ORDER BY thdv.create_time DESC
|
ORDER BY a.val DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!--人员出入场记录-->
|
<!--人员出入场记录-->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue