diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java index 6bff04fc7..cdd3b1419 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java @@ -9,7 +9,6 @@ import com.zhgd.xmgl.call.HikvisionCall; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.car.entity.CarInfo; import com.zhgd.xmgl.modules.project.entity.Project; -import com.zhgd.xmgl.modules.project.entity.ProjectUfaceConfig; import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd; import com.zhgd.xmgl.modules.video.entity.VideoItem; @@ -287,12 +286,12 @@ public class AsyncHikvision { String msg = ""; String sucSbStr = sucSb.toString(); if (StringUtils.isNotBlank(sucSbStr)) { - sucSbStr += "下发成功:"; + sucSbStr = "下发权限成功:" + sucSbStr; msg += sucSbStr + ","; } String failSbStr = failSb.toString(); if (StringUtils.isNotBlank(failSbStr)) { - failSbStr += "下发失败:"; + failSbStr = "下发权限失败:" + failSbStr; msg += failSbStr + ","; } noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); @@ -323,6 +322,7 @@ public class AsyncHikvision { } } catch (Exception e) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), e.getMessage(), "人员下发设备提醒", "1"); + return; } if (SecurityUtils.getUser().getUserId() != null) { @@ -331,12 +331,12 @@ public class AsyncHikvision { String msg = ""; String sucSbStr = sucSb.toString(); if (StringUtils.isNotBlank(sucSbStr)) { - sucSbStr += "下发成功:"; + sucSbStr += "移除权限成功:"; msg += sucSbStr + ","; } String failSbStr = failSb.toString(); if (StringUtils.isNotBlank(failSbStr)) { - failSbStr += "下发失败:"; + failSbStr += "移除权限失败:"; msg += failSbStr + ","; } noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index d5bffa451..6843312d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -113,6 +113,8 @@ public class SystemUserServiceImpl extends ServiceImpl() + .eq(XzSystemUserToCompanyProject::getType, 2) + .last("limit 1") + ); + if (xzSystemUserToCompanyProject != null) { + result.put("sn", xzSystemUserToCompanyProject.getSn()); + } + } return result; }