admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-03-08 11:19:14 +08:00
parent 78c3e53e21
commit 263f7ef12d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -94,12 +94,6 @@ public class HikvisionCall {
JSONObject dataJo = jo1.getJSONObject("data"); JSONObject dataJo = jo1.getJSONObject("data");
String happenTime = jo1.getString("happenTime"); String happenTime = jo1.getString("happenTime");
String srcIndex = jo1.getString("srcIndex"); String srcIndex = jo1.getString("srcIndex");
JSONObject extEventIdentityCardInfoJo = dataJo.getJSONObject("ExtEventIdentityCardInfo");
if (extEventIdentityCardInfoJo == null) {
String s = "extEventIdentityCardInfoJo为null";
log.info(s);
return Result.error(s);
}
String extEventPersonNo = dataJo.getString("ExtEventPersonNo"); String extEventPersonNo = dataJo.getString("ExtEventPersonNo");
String extEventCardNo = dataJo.getString("ExtEventCardNo"); String extEventCardNo = dataJo.getString("ExtEventCardNo");
WorkerInfo workerInfo = workerInfoMapper.selectById(extEventPersonNo); WorkerInfo workerInfo = workerInfoMapper.selectById(extEventPersonNo);
@ -123,8 +117,8 @@ public class HikvisionCall {
map.put("projectCode", workerInfo.getProjectSn()); map.put("projectCode", workerInfo.getProjectSn());
map.put("devCode", srcIndex); map.put("devCode", srcIndex);
try { try {
String extEventPictureURL = extEventIdentityCardInfoJo.getString("ExtEventPictureURL"); String extEventPictureURL = dataJo.getString("ExtEventPictureURL");
String svrIndexCode = extEventIdentityCardInfoJo.getString("svrIndexCode"); String svrIndexCode = dataJo.getString("svrIndexCode");
HikvisionEventsPictureRq rq = new HikvisionEventsPictureRq(); HikvisionEventsPictureRq rq = new HikvisionEventsPictureRq();
rq.setPicUri(extEventPictureURL); rq.setPicUri(extEventPictureURL);
rq.setSvrIndexCode(svrIndexCode); rq.setSvrIndexCode(svrIndexCode);
@ -1193,6 +1187,9 @@ public class HikvisionCall {
public String saveToLocal(String url) { public String saveToLocal(String url) {
if (StringUtils.isBlank(url)) {
return null;
}
String fileName = IdUtil.simpleUUID() + ".png"; String fileName = IdUtil.simpleUUID() + ".png";
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
try { try {

1
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
View File

@ -830,6 +830,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
resultMap.put("status", "0"); resultMap.put("status", "0");
} }
} else { } else {
log.info("请先上传对应设备信息，idCard:{}", idCard);
resultMap.put("msg", "请先上传对应设备信息"); resultMap.put("msg", "请先上传对应设备信息");
resultMap.put("status", "0"); resultMap.put("status", "0");
} }