diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 6a8c9d4b0..723a1bfdb 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -1086,11 +1086,12 @@ public class HikvisionCall { } if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, "24"); - } - if (carInfo.getUserIds() != null && carInfo.getUserIds().size() > 0) { + } else if (carInfo.getUserIds() != null && carInfo.getUserIds().size() > 0) { for (String userId : carInfo.getUserIds()) { noticeService.addUserNotice(Long.valueOf(userId), msg, title, "24"); } + } else if (carInfo.getCreateBy() != null) { + noticeService.addUserNotice(carInfo.getCreateBy(), msg, title, "24"); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 14feff938..839c7125b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -109,6 +109,7 @@ public class CarInfoController { carInfo.setAlarmPushWorkerId(alarmPushWorkerIds.get(0).toString()); } if (userId != null) { + carInfo.setCreateBy(Long.valueOf(userId)); Long workerId = systemUserService.getOne(Wrappers.lambdaQuery().eq(SystemUser::getUserId, userId)).getWorkerId(); carInfo.setEnterpriseId(workerInfoService.getById(workerId).getEnterpriseId()); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java index 5c25b1f85..c7619ca9b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java @@ -117,6 +117,8 @@ public class CarInfo implements Serializable { private Integer entryAndExitPermit; @ApiModelProperty(value = "企业id") private Long enterpriseId; + @ApiModelProperty(value = "创建人ID") + private Long createBy; @ApiModelProperty(value = "驾驶证") private java.lang.String jsz; diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java index 97476bfd6..a246a7018 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java @@ -17,6 +17,7 @@ import com.zhgd.xmgl.modules.car.mapper.*; import com.zhgd.xmgl.modules.car.service.ICarInfoService; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl; +import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -110,6 +111,7 @@ public class CarInfoServiceImpl extends ServiceImpl impl return Result.ok("车辆已存在,预约时间已覆盖更新"); } } else { + c.setCreateBy(SecurityUtils.getUser().getUserId()); carInfoMapper.insert(c); //同步海康 asyncHikvision.addCarInfoForHikvision(c);