From 7b973b3b9b723f48c54f2c0c5083886573224541 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 05 一月 2026 16:40:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
index 2203fde..ae72ad5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java
@@ -86,14 +86,31 @@
if (data.getChanNum() == 0) {
data.setChanNum(1);
}
+ data.setUpdateBy(ContextUtil.getLoginUserName());
+ data.setUpdateTime(new Date());
if(StringUtils.isEmpty(data.getId())){
data.setId(ContextUtil.generateId());
data.setCreateBy(ContextUtil.getLoginUserName());
data.setCreateTime(new Date());
+ cameraMapper.insert(data);
+ }else {
+ cameraMapper.updateById(data);
}
+ }
+
+ /**
+ * 杩滅▼鎷夊彇鐩戞帶淇℃伅鍚庢洿鏂�
+ * @param data
+ */
+ public void pullUpdateCamera(Camera data) {
data.setUpdateBy(ContextUtil.getLoginUserName());
data.setUpdateTime(new Date());
- cameraMapper.insert(data);
+ int i = cameraMapper.updateById(data);
+ if(i == 0){
+ data.setCreateBy(ContextUtil.getLoginUserName());
+ data.setCreateTime(new Date());
+ cameraMapper.insert(data);
+ }
}
/**
--
Gitblit v1.9.3