|
|
@@ -1,6 +1,6 @@
|
|
|
package com.middle.platform.manage.biz.service;
|
|
|
|
|
|
-import cn.dev33.satoken.stp.StpUtil;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.middle.platform.common.constant.Global;
|
|
|
@@ -19,7 +19,6 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
|
|
|
@@ -84,20 +83,22 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
|
|
|
check(deviceId);
|
|
|
}
|
|
|
iotProjectDevicePara.getDeviceIds().forEach(e -> {
|
|
|
- IotProjectDevice iotProjectDevice = new IotProjectDevice();
|
|
|
- iotProjectDevice.setDeviceId(e);
|
|
|
- iotProjectDevice.setUpdateBy(StpUtil.getLoginIdAsLong());
|
|
|
- iotProjectDevice.setUpdateTime(LocalDateTime.now());
|
|
|
- iotProjectDevice.setProjectId(iotProjectDevicePara.getProjectId());
|
|
|
- IotProjectDevice res = iotProjectDeviceMapper.selectByProjectDevice(iotProjectDevice);
|
|
|
- if (res == null) {
|
|
|
- iotProjectDevice.setCreateBy(StpUtil.getLoginIdAsLong());
|
|
|
- iotProjectDevice.setCreateTime(LocalDateTime.now());
|
|
|
- //没有则新增
|
|
|
- iotProjectDeviceMapper.insert(iotProjectDevice);
|
|
|
- } else {
|
|
|
+ IotProjectDevice iotProjectDevice = iotProjectDeviceMapper.selectOne(new LambdaQueryWrapper<IotProjectDevice>()
|
|
|
+ .eq(IotProjectDevice::getDeviceId, e)
|
|
|
+ .eq(IotProjectDevice::getDelFlag, Global.UN_DEL)
|
|
|
+ );
|
|
|
+ if (Objects.nonNull(iotProjectDevice)) {
|
|
|
//有则更新状态即可
|
|
|
- iotProjectDeviceMapper.updateByProjectDevice(iotProjectDevice);
|
|
|
+ iotProjectDevice.setProjectId(iotProjectDevice.getProjectId());
|
|
|
+ iotProjectDevice.setUpdateBy(null);
|
|
|
+ iotProjectDevice.setUpdateTime(null);
|
|
|
+ iotProjectDeviceMapper.updateById(iotProjectDevice);
|
|
|
+ } else {
|
|
|
+ //没有则新增
|
|
|
+ IotProjectDevice iotProjectDeviceA = new IotProjectDevice();
|
|
|
+ iotProjectDeviceA.setProjectId(iotProjectDevicePara.getProjectId());
|
|
|
+ iotProjectDeviceA.setDeviceId(e);
|
|
|
+ iotProjectDeviceMapper.insert(iotProjectDeviceA);
|
|
|
}
|
|
|
});
|
|
|
return true;
|