|
|
@@ -43,23 +43,24 @@ public class MetaShowRoomAssetService {
|
|
|
return metaShowRoomAssetRepo.findAll(JpaUtils.toSpecification(pageQuery, MetaShowRoomAsset.class), JpaUtils.toPageRequest(pageQuery));
|
|
|
}
|
|
|
|
|
|
- public MetaRestResult<Boolean> putOn(MetaShowRoomAsset metaShowRoomAsset) {
|
|
|
+ public MetaRestResult<String> putOn(MetaShowRoomAsset metaShowRoomAsset) {
|
|
|
MetaServiceResult result = checkParams(metaShowRoomAsset);
|
|
|
if (!result.isSuccess()) {
|
|
|
- return MetaRestResult.returnError(result.getMessage(), Boolean.FALSE);
|
|
|
+ return MetaRestResult.returnError(result.getMessage());
|
|
|
}
|
|
|
Asset asset = assetRepo.findById(metaShowRoomAsset.getAssetId()).orElse(null);
|
|
|
if (Objects.isNull(asset)) {
|
|
|
- return MetaRestResult.returnError("不存在该资产", Boolean.FALSE);
|
|
|
+ return MetaRestResult.returnError("不存在该资产");
|
|
|
}
|
|
|
if (!asset.getUserId().equals(metaShowRoomAsset.getUserId())) {
|
|
|
return MetaRestResult.returnError("该资产不属于你");
|
|
|
}
|
|
|
if (Constants.META_INOPERABLE_STATUS.contains(asset.getStatus())) {
|
|
|
- return MetaRestResult.returnError(String.format("该资产目前状态为[%S],不可上架。请刷新藏品室数据", asset.getStatus().getDescription()), Boolean.FALSE);
|
|
|
+ return MetaRestResult.returnError(String.format("该资产目前状态为[%S],不可上架。请刷新藏品室数据", asset.getStatus().getDescription()));
|
|
|
}
|
|
|
metaShowRoomAssetRepo.save(metaShowRoomAsset);
|
|
|
- return MetaRestResult.returnSuccess("上架成功", Boolean.TRUE);
|
|
|
+ boolean whetherTest = sysConfigService.getBoolean(Constants.WHETHER_TEST);
|
|
|
+ return MetaRestResult.returnSuccess("上架成功", whetherTest ? URL_PREFIX_TEST.concat(String.valueOf(asset.getId())) : URL_PREFIX.concat(String.valueOf(asset.getId())));
|
|
|
}
|
|
|
|
|
|
public MetaRestResult<Boolean> putOff(Long assetId) {
|