|
|
@@ -4,7 +4,9 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
|
|
|
import com.github.microservice.net.ResultContent;
|
|
|
import com.github.microservice.net.ResultMessage;
|
|
|
import com.zhongshu.card.client.model.base.IDsParam;
|
|
|
+import com.zhongshu.card.client.model.visitor.setting.VisitorSettingDeviceModel;
|
|
|
import com.zhongshu.card.client.model.visitor.setting.VisitorSettingDeviceParam;
|
|
|
+import com.zhongshu.card.client.model.visitor.setting.VisitorSettingDeviceSearch;
|
|
|
import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
|
|
|
import com.zhongshu.card.server.core.dao.org.OrganizationDao;
|
|
|
import com.zhongshu.card.server.core.dao.scene.SceneComponentDao;
|
|
|
@@ -13,8 +15,6 @@ import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
|
|
|
import com.zhongshu.card.server.core.domain.org.Organization;
|
|
|
import com.zhongshu.card.server.core.domain.scene.SceneComponent;
|
|
|
import com.zhongshu.card.server.core.domain.visitor.VisitorSettingDevice;
|
|
|
-import com.zhongshu.card.client.model.visitor.setting.VisitorSettingDeviceModel;
|
|
|
-import com.zhongshu.card.client.model.visitor.setting.VisitorSettingDeviceSearch;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -69,14 +69,20 @@ public class VisitorSettingDeviceService extends SuperService {
|
|
|
}
|
|
|
if (ObjectUtils.isNotEmpty(list)) {
|
|
|
List<VisitorSettingDevice> saveList = new ArrayList<>();
|
|
|
-
|
|
|
+ String projectOid = sceneComponent.getProjectOid();
|
|
|
+ if (StringUtils.isEmpty(projectOid) && sceneComponent.getSceneInfo() != null) {
|
|
|
+ projectOid = sceneComponent.getSceneInfo().getProjectOid();
|
|
|
+ }
|
|
|
+ if (StringUtils.isEmpty(projectOid)) {
|
|
|
+ return ResultContent.buildFail("projectOid 信息为空");
|
|
|
+ }
|
|
|
for (DeviceInfo deviceInfo : list) {
|
|
|
VisitorSettingDevice entity = visitorSettingDeviceDao.findTopBySceneComponentIdAndDeviceId(param.getSceneComponentId(), deviceInfo.getDeviceId());
|
|
|
if (ObjectUtils.isEmpty(entity)) {
|
|
|
entity = new VisitorSettingDevice();
|
|
|
entity.setDeviceInfo(deviceInfo);
|
|
|
entity.setSceneComponentId(sceneComponent.getId());
|
|
|
- entity.setProjectOid(sceneComponent.getProjectOid());
|
|
|
+ entity.setProjectOid(projectOid);
|
|
|
entity.setDeviceId(deviceInfo.getDeviceId());
|
|
|
initEntity(entity);
|
|
|
} else {
|