wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG

dev
xiepeng 2024-07-11 18:18:59 +08:00
parent 46c6259aac
commit e17cd752c0
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/service/check/impl/CheckRecordServiceImpl.java
View File

@ -263,8 +263,10 @@ public class CheckRecordServiceImpl implements CheckRecordService {
day.put("CHECKDATA","-"); day.put("CHECKDATA","-");
} }
else { else {
boolean flag = true;
for (PageData r : recordList) { for (PageData r : recordList) {
if (curDay.equals(r.getString("PERIODSTART").substring(0,10))) { if (curDay.equals(r.getString("PERIODSTART").substring(0,10))) {
flag = false;
if ("1".equals(r.getString("TYPE"))) { if ("1".equals(r.getString("TYPE"))) {
day.put("CHECKDATA", "√"); // 已检查（隐患数） day.put("CHECKDATA", "√"); // 已检查（隐患数）
break; break;
@ -274,6 +276,9 @@ public class CheckRecordServiceImpl implements CheckRecordService {
} }
} }
} }
if (flag) {
day.put("CHECKDATA","×"); // 未排查
}
} }
dayList.add(day); dayList.add(day);
if (j % 7 == 0) { if (j % 7 == 0) {

3
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -1137,7 +1137,8 @@ public class UsersServiceImpl implements UsersService {
try { try {
FaceUtil.compareFace(pd.getString("USERAVATARURL"), pd.getString("USERAVATARURL")); FaceUtil.compareFace(pd.getString("USERAVATARURL"), pd.getString("USERAVATARURL"));
} catch (Exception e) { } catch (Exception e) {
throw new Exception("人脸图像不符合要求，请重新上传"); return ReturnMap.ok("errorFace");
/*throw new Exception("人脸图像不符合要求，请重新上传");*/
} }
} }
/*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) { /*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) {

5
src/main/java/com/zcloud/util/ali/GetPlayInfo.java
View File

@ -27,7 +27,7 @@ public class GetPlayInfo {
DefaultAcsClient client = initVodClient(); DefaultAcsClient client = initVodClient();
GetPlayInfoRequest request = new GetPlayInfoRequest(); GetPlayInfoRequest request = new GetPlayInfoRequest();
request.setVideoId(pd.getString("videoId")); request.setVideoId(pd.getString("videoId"));
request.setPlayConfig("{\"PlayDomain\":" + "\"" + pd.get("DOMAIN") + "\"}"); request.setPlayConfig("{\"PlayDomain\":" + "\"tszs.qhdsafety.com\"}");
return client.getAcsResponse(request); return client.getAcsResponse(request);
} }
@ -48,7 +48,8 @@ public class GetPlayInfo {
request.setAuthTimeout(Long.valueOf(pd.getString("timeOut"))); request.setAuthTimeout(Long.valueOf(pd.getString("timeOut")));
request.setFormats(pd.getString("formats")); request.setFormats(pd.getString("formats"));
request.setResultType("Multiple"); 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); GetPlayInfoResponse response = client.getAcsResponse(request);
List<GetPlayInfoResponse.PlayInfo> playInfoList = response.getPlayInfoList(); List<GetPlayInfoResponse.PlayInfo> playInfoList = response.getPlayInfoList();
GetPlayInfoResponse.VideoBase videoBase = response.getVideoBase(); GetPlayInfoResponse.VideoBase videoBase = response.getVideoBase();