Commit c6e89539 authored by 赵啸非's avatar 赵啸非

修改注册接口

parent 80d9d6d1
...@@ -1041,14 +1041,17 @@ public class DeviceApiController { ...@@ -1041,14 +1041,17 @@ public class DeviceApiController {
DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery(); DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
query.setSiteId(deviceEntity.getSiteId()); query.setSiteId(deviceEntity.getSiteId());
query.setProductId(productEntity.getId()); query.setProductId(productEntity.getId());
query.setSelected(YesNoEnum.YES.getValue()); //query.setSelected(YesNoEnum.YES.getValue());
query.setSelectedList(Arrays.asList(YesNoEnum.YES.getValue(),YesNoEnum.NO.getValue()));
DeviceModuleDistributeEntity deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query); DeviceModuleDistributeEntity deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);
if (ObjectUtils.isEmpty(deviceModuleDistributeEntity)) { if (ObjectUtils.isEmpty(deviceModuleDistributeEntity)) {
//没有默认选择的资源,实施部署更新一个默认选择 todo /* //没有默认选择的资源,实施部署更新一个默认选择 todo
query = new DeviceModuleDistributeQuery(); query = new DeviceModuleDistributeQuery();
query.setSiteId(deviceEntity.getSiteId()); query.setSiteId(deviceEntity.getSiteId());
query.setProductId(productEntity.getId()); query.setProductId(productEntity.getId());
query.setSelected(YesNoEnum.NO.getValue());
query.setSelectedList(Arrays.asList(1,0));
// query.setSelected(YesNoEnum.NO.getValue());
deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query); deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);
if (!ObjectUtils.isEmpty(deviceModuleDistributeEntity)) { if (!ObjectUtils.isEmpty(deviceModuleDistributeEntity)) {
//deviceModuleDistributeService.active(deviceModuleDistributeEntity, null); //deviceModuleDistributeService.active(deviceModuleDistributeEntity, null);
...@@ -1069,7 +1072,7 @@ public class DeviceApiController { ...@@ -1069,7 +1072,7 @@ public class DeviceApiController {
} }
} else { } else {
log.info("资源为空!产品名称:{}",deviceEntity.getProductName()); log.info("资源为空!产品名称:{}",deviceEntity.getProductName());
} }*/
} else { } else {
//homeDeviceUrl/1/pdj/1920x1080 //homeDeviceUrl/1/pdj/1920x1080
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment