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

bug修复

Browse Source
This commit is contained in:
GUO 2024-05-03 21:34:42 +08:00
parent 36bbac31ef
commit e311eed700
2 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -977,24 +977,36 @@ public class HikvisionCall {
xzHikvisionSync.setIsSuccess(1); xzHikvisionSync.setIsSuccess(1);
xzHikvisionSyncMapper.updateById(xzHikvisionSync); xzHikvisionSyncMapper.updateById(xzHikvisionSync);
Integer fail = xzHikvisionSyncMapper.selectCount(new LambdaQueryWrapper<XzHikvisionSync>() if (type >= 4) {
.eq(XzHikvisionSync::getProjectSn, projectSn) Integer fail = getFailOrSucCount(projectSn, whoId, now, 0);
.eq(XzHikvisionSync::getWhoId, whoId) if (fail == 0) {
.eq(XzHikvisionSync::getCreateDate, now) carInfoMapper.update(null, new LambdaUpdateWrapper<CarInfo>()
.eq(XzHikvisionSync::getIsSuccess, 0) .eq(CarInfo::getId, whoId)
.set(CarInfo::getSendSuccessStatus, 1)
); );
} else {
Integer sc = getFailOrSucCount(projectSn, whoId, now, 1);
if (sc == 0) {
carInfoMapper.update(null, new LambdaUpdateWrapper<CarInfo>()
.eq(CarInfo::getId, whoId)
.set(CarInfo::getSendSuccessStatus, 2)
);
} else {
carInfoMapper.update(null, new LambdaUpdateWrapper<CarInfo>()
.eq(CarInfo::getId, whoId)
.set(CarInfo::getSendSuccessStatus, 3)
);
}
}
} else {
Integer fail = getFailOrSucCount(projectSn, whoId, now, 0);
if (fail == 0) { if (fail == 0) {
workerInfoMapper.update(null, new LambdaUpdateWrapper<WorkerInfo>() workerInfoMapper.update(null, new LambdaUpdateWrapper<WorkerInfo>()
.eq(WorkerInfo::getId, whoId) .eq(WorkerInfo::getId, whoId)
.set(WorkerInfo::getSendSuccessStatus, 1) .set(WorkerInfo::getSendSuccessStatus, 1)
); );
} else { } else {
Integer sc = xzHikvisionSyncMapper.selectCount(new LambdaQueryWrapper<XzHikvisionSync>() Integer sc = getFailOrSucCount(projectSn, whoId, now, 1);
.eq(XzHikvisionSync::getProjectSn, projectSn)
.eq(XzHikvisionSync::getWhoId, whoId)
.eq(XzHikvisionSync::getCreateDate, now)
.eq(XzHikvisionSync::getIsSuccess, 1)
);
if (sc == 0) { if (sc == 0) {
workerInfoMapper.update(null, new LambdaUpdateWrapper<WorkerInfo>() workerInfoMapper.update(null, new LambdaUpdateWrapper<WorkerInfo>()
.eq(WorkerInfo::getId, whoId) .eq(WorkerInfo::getId, whoId)
@ -1008,6 +1020,17 @@ public class HikvisionCall {
} }
} }
} }
}
private Integer getFailOrSucCount(String projectSn, Long whoId, Date now, int val) {
Integer fail = xzHikvisionSyncMapper.selectCount(new LambdaQueryWrapper<XzHikvisionSync>()
.eq(XzHikvisionSync::getProjectSn, projectSn)
.eq(XzHikvisionSync::getWhoId, whoId)
.eq(XzHikvisionSync::getCreateDate, now)
.eq(XzHikvisionSync::getIsSuccess, val)
);
return fail;
}
/** /**
* 编辑人脸 * 编辑人脸

3
src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java
View File

@ -125,7 +125,8 @@ public class CarInfo implements Serializable {
private java.lang.String jqx; private java.lang.String jqx;
@ApiModelProperty(value = "其他证明") @ApiModelProperty(value = "其他证明")
private java.lang.String otherProve; private java.lang.String otherProve;
@ApiModelProperty(value = "下发状态：1成功2失败3部分成功")
private Integer sendSuccessStatus;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "企业名称") @ApiModelProperty(value = "企业名称")
private String enterpriseName; private String enterpriseName;