From b00dd7882fa19c346d086363c67c76b01051e594 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 09 八月 2023 13:52:50 +0800
Subject: [PATCH] 数据库取消uuid自动生成主键，对应的实体业务增加主键uuid
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java | 2 ++
ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java | 7 +++++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1 +
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java | 2 ++
ard-work/src/main/java/com/ruoyi/device/radar/service/impl/ArdEquipRadarServiceImpl.java | 2 ++
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | 1 +
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java | 2 ++
ard-work/src/main/java/com/ruoyi/device/tower/service/impl/ArdTowersServiceImpl.java | 2 ++
ard-work/src/main/java/com/ruoyi/alarmpoints/policeRoom/service/impl/ArdPoliceRoomServiceImpl.java | 2 ++
9 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java
index ac64509..c10c735 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java
@@ -4,7 +4,9 @@
import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.List;
@@ -50,8 +52,9 @@
*/
@Override
public int insertArdAlarmTube(ArdAlarmTube ardAlarmTube) {
- ardAlarmTube.setCreateTime(DateUtils.getNowDate());
- return ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
+ ardAlarmTube.setTubeId(IdUtils.simpleUUID());
+ ardAlarmTube.setCreateTime(DateUtils.getNowDate());
+ return ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/policeRoom/service/impl/ArdPoliceRoomServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/policeRoom/service/impl/ArdPoliceRoomServiceImpl.java
index 8476de0..abdc5b7 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/policeRoom/service/impl/ArdPoliceRoomServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/policeRoom/service/impl/ArdPoliceRoomServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -59,6 +60,7 @@
@Override
public int insertArdPoliceRoom(ArdPoliceRoom ardPoliceRoom)
{
+ ardPoliceRoom.setId(IdUtils.simpleUUID());
ardPoliceRoom.setUserId(SecurityUtils.getUserId());
ardPoliceRoom.setCreateBy(SecurityUtils.getUsername());
ardPoliceRoom.setCreateTime(DateUtils.getNowDate());
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
index e3c6ff2..e9bb7d6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,7 @@
*/
@Override
public int insertArdTubesDetails(ArdTubesDetails ardTubesDetails) {
+ ardTubesDetails.setId(IdUtils.simpleUUID());
ardTubesDetails.setUserId(SecurityUtils.getUserId());
ardTubesDetails.setCreateBy(SecurityUtils.getUsername());
ardTubesDetails.setCreateTime(DateUtils.getNowDate());
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
index 2560c99..1dee4da 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -67,6 +68,7 @@
*/
@Override
public int insertArdTubes(ArdTubes ardTubes) {
+ ardTubes.setId(IdUtils.simpleUUID());
ardTubes.setChildCount(0);
ardTubes.setUserId(SecurityUtils.getUserId());
ardTubes.setCreateBy(SecurityUtils.getUsername());
diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/service/impl/ArdEquipRadarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/radar/service/impl/ArdEquipRadarServiceImpl.java
index 0e1a2f7..e8436d8 100644
--- a/ard-work/src/main/java/com/ruoyi/device/radar/service/impl/ArdEquipRadarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/radar/service/impl/ArdEquipRadarServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
@@ -57,6 +58,7 @@
@Override
public int insertArdEquipRadar(ArdEquipRadar ardEquipRadar)
{
+ ardEquipRadar.setId(IdUtils.simpleUUID());
ardEquipRadar.setCreateTime(DateUtils.getNowDate());
ardEquipRadar.setCreateBy(SecurityUtils.getUsername());
ardEquipRadar.setUserId(SecurityUtils.getUserId());
diff --git a/ard-work/src/main/java/com/ruoyi/device/tower/service/impl/ArdTowersServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/tower/service/impl/ArdTowersServiceImpl.java
index 62ccf41..f7937d9 100644
--- a/ard-work/src/main/java/com/ruoyi/device/tower/service/impl/ArdTowersServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/tower/service/impl/ArdTowersServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.tower.domain.ArdTowers;
import com.ruoyi.device.tower.mapper.ArdTowersMapper;
import com.ruoyi.device.tower.service.IArdTowersService;
@@ -55,6 +56,7 @@
*/
@Override
public int insertArdTowers(ArdTowers ardTowers) {
+ ardTowers.setId(IdUtils.simpleUUID());
ardTowers.setUserId(SecurityUtils.getUserId());
ardTowers.setCreateBy(SecurityUtils.getUsername());
ardTowers.setCreateTime(DateUtils.getNowDate());
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
index 66f6a26..5644b88 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -93,6 +93,7 @@
@Transactional
@Override
public int insertArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask) {
+ ardVideoInspectTask.setId(IdUtils.simpleUUID());
ardVideoInspectTask.setCreateBy(SecurityUtils.getUsername());
ardVideoInspectTask.setCreateTime(DateUtils.getNowDate());
ardVideoInspectTask.setUserId(SecurityUtils.getUserId());
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java
index 4b02b0a..f7e07a7 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskStepServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskStepMapper;
@@ -52,6 +53,7 @@
*/
@Override
public int insertArdVideoInspectTaskStep(ArdVideoInspectTaskStep ardVideoInspectTaskStep) {
+ ardVideoInspectTaskStep.setId(IdUtils.simpleUUID());
ardVideoInspectTaskStep.setUserId(SecurityUtils.getUserId());
return ardVideoInspectTaskStepMapper.insertArdVideoInspectTaskStep(ardVideoInspectTaskStep);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ba64906..0081723 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -312,6 +312,7 @@
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
+ user.setUserId(IdUtils.simpleUUID());
int rows = userMapper.insertUser(user);
if (rows > 0) { //澧炲姞鐢ㄦ埛缂撳瓨
redisCache.setCacheObject(getCacheKey(user.getUserId()), user);
--
Gitblit v1.9.3