2023-05-30 11:32:35 优化完善好策略管理的增、删、修、查改接口!

master
魔神煜修罗皇 2 years ago
parent 06bf798da5
commit c6fee6f2db
  1. 13
      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) { public Boolean insert(PsdcSceneRes scenes) {
Date date = new Date(); Date date = new Date();
long timestamp = getSecondTimestampTwo(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<>(); List<SceneVo> scenesList = new ArrayList<>();
for (DeviceVo dev : scenes.getDeviceVos()) { for (DeviceVo dev : scenes.getDeviceVos()) {
if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) { if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
@ -70,9 +71,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
try { try {
for (SceneVo sc : scenesList) { for (SceneVo sc : scenesList) {
sc.setSceneCode(timestamp); sc.setSceneCode(timestamp);
sc.setUserId(scenes.getUserId()); sc.setUserId(userId);
sc.setCreateBy(userName); sc.setCreateBy(userName);
sc.setCreateTime(scenes.getCreateTime()); sc.setCreateTime(sdf.format(date));
sc.setSceneRemark(scenes.getSceneRemark()); sc.setSceneRemark(scenes.getSceneRemark());
} }
psdcSceneMapper.InsertSceneData(scenesList); psdcSceneMapper.InsertSceneData(scenesList);
@ -99,9 +100,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
@Override @Override
@Transactional(propagation = REQUIRES_NEW) @Transactional(propagation = REQUIRES_NEW)
public Boolean update(PsdcSceneRes scenes) { public Boolean update(PsdcSceneRes scenes) {
Long userId = SecurityUtils.getUserId();
Date date = new Date(); Date date = new Date();
String userName = sysUserMapper.selectUserById(scenes.getUserId()).getUserName(); String userName = sysUserMapper.selectUserById(userId).getUserName();
List<SceneVo> scenesList = new ArrayList<>(); List<SceneVo> scenesList = new ArrayList<>();
for (DeviceVo dev : scenes.getDeviceVos()) { for (DeviceVo dev : scenes.getDeviceVos()) {
if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) { if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {
@ -122,7 +123,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
try { try {
for (SceneVo sc : scenesList) { for (SceneVo sc : scenesList) {
sc.setSceneCode(scenes.getSceneCode()); sc.setSceneCode(scenes.getSceneCode());
sc.setUserId(scenes.getUserId()); sc.setUserId(userId);
sc.setUpdateBy(userName); sc.setUpdateBy(userName);
sc.setUpdateTime(sdf.format(date)); sc.setUpdateTime(sdf.format(date));
sc.setSceneRemark(scenes.getSceneRemark()); sc.setSceneRemark(scenes.getSceneRemark());

Loading…
Cancel
Save