From c6fee6f2dbb7636faa975301d45bed9314136b9f Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Tue, 30 May 2023 11:32:07 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-30=2011:32:35=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A5=BD=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E5=A2=9E=E3=80=81=E5=88=A0=E3=80=81=E4=BF=AE=E3=80=81?=
 =?UTF-8?q?=E6=9F=A5=E6=94=B9=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/psdc/service/impl/PsdcSceneServiceImpl.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
index 15e5905..7404065 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java
@@ -49,7 +49,8 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
     public Boolean insert(PsdcSceneRes scenes) {
         Date date = new Date();
         long timestamp = getSecondTimestampTwo(date);
-        String userName = sysUserMapper.selectUserById(scenes.getUserId()).getUserName();
+        Long userId = SecurityUtils.getUserId();
+        String userName = sysUserMapper.selectUserById(userId).getUserName();
         List<SceneVo> scenesList = new ArrayList<>();
         for (DeviceVo dev : scenes.getDeviceVos()) {
             if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
@@ -70,9 +71,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
         try {
             for (SceneVo sc : scenesList) {
                 sc.setSceneCode(timestamp);
-                sc.setUserId(scenes.getUserId());
+                sc.setUserId(userId);
                 sc.setCreateBy(userName);
-                sc.setCreateTime(scenes.getCreateTime());
+                sc.setCreateTime(sdf.format(date));
                 sc.setSceneRemark(scenes.getSceneRemark());
             }
             psdcSceneMapper.InsertSceneData(scenesList);
@@ -99,9 +100,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
     @Override
     @Transactional(propagation = REQUIRES_NEW)
     public Boolean update(PsdcSceneRes scenes) {
-
+        Long userId = SecurityUtils.getUserId();
         Date date = new Date();
-        String userName = sysUserMapper.selectUserById(scenes.getUserId()).getUserName();
+        String userName = sysUserMapper.selectUserById(userId).getUserName();
         List<SceneVo> scenesList = new ArrayList<>();
         for (DeviceVo dev : scenes.getDeviceVos()) {
             if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
@@ -122,7 +123,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
         try {
             for (SceneVo sc : scenesList) {
                 sc.setSceneCode(scenes.getSceneCode());
-                sc.setUserId(scenes.getUserId());
+                sc.setUserId(userId);
                 sc.setUpdateBy(userName);
                 sc.setUpdateTime(sdf.format(date));
                 sc.setSceneRemark(scenes.getSceneRemark());