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 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 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());