diff --git a/src/main/java/com/zcloud/service/check/impl/CheckRecordServiceImpl.java b/src/main/java/com/zcloud/service/check/impl/CheckRecordServiceImpl.java index d181137..91329b0 100644 --- a/src/main/java/com/zcloud/service/check/impl/CheckRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/check/impl/CheckRecordServiceImpl.java @@ -263,8 +263,10 @@ public class CheckRecordServiceImpl implements CheckRecordService { day.put("CHECKDATA","-"); } else { + boolean flag = true; for (PageData r : recordList) { if (curDay.equals(r.getString("PERIODSTART").substring(0,10))) { + flag = false; if ("1".equals(r.getString("TYPE"))) { day.put("CHECKDATA", "√"); // 已检查(隐患数) break; @@ -274,6 +276,9 @@ public class CheckRecordServiceImpl implements CheckRecordService { } } } + if (flag) { + day.put("CHECKDATA","×"); // 未排查 + } } dayList.add(day); if (j % 7 == 0) { diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index adf0553..f506be0 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -1137,7 +1137,8 @@ public class UsersServiceImpl implements UsersService { try { FaceUtil.compareFace(pd.getString("USERAVATARURL"), pd.getString("USERAVATARURL")); } catch (Exception e) { - throw new Exception("人脸图像不符合要求,请重新上传"); + return ReturnMap.ok("errorFace"); + /*throw new Exception("人脸图像不符合要求,请重新上传");*/ } } /*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) { diff --git a/src/main/java/com/zcloud/util/ali/GetPlayInfo.java b/src/main/java/com/zcloud/util/ali/GetPlayInfo.java index c63f08d..bcafe4e 100644 --- a/src/main/java/com/zcloud/util/ali/GetPlayInfo.java +++ b/src/main/java/com/zcloud/util/ali/GetPlayInfo.java @@ -27,7 +27,7 @@ public class GetPlayInfo { DefaultAcsClient client = initVodClient(); GetPlayInfoRequest request = new GetPlayInfoRequest(); request.setVideoId(pd.getString("videoId")); - request.setPlayConfig("{\"PlayDomain\":" + "\"" + pd.get("DOMAIN") + "\"}"); + request.setPlayConfig("{\"PlayDomain\":" + "\"tszs.qhdsafety.com\"}"); return client.getAcsResponse(request); } @@ -48,7 +48,8 @@ public class GetPlayInfo { request.setAuthTimeout(Long.valueOf(pd.getString("timeOut"))); request.setFormats(pd.getString("formats")); request.setResultType("Multiple"); - request.setPlayConfig("{\"PlayDomain\":" + "\"" + pd.getString("oem_domain_name") + "\"}"); +// request.setPlayConfig("{\"PlayDomain\":" + "\"" + pd.getString("oem_domain_name") + "\"}"); + request.setPlayConfig("{\"PlayDomain\":" + "\"tszs.qhdsafety.com\"}"); GetPlayInfoResponse response = client.getAcsResponse(request); List playInfoList = response.getPlayInfoList(); GetPlayInfoResponse.VideoBase videoBase = response.getVideoBase();