|
@@ -151,12 +151,16 @@ public class SizePoolService implements ISizePoolService{ |
|
@@ -151,12 +151,16 @@ public class SizePoolService implements ISizePoolService{ |
151
|
SizePoolResp resp = new SizePoolResp();
|
151
|
SizePoolResp resp = new SizePoolResp();
|
152
|
resp.setId(sizePoolId);
|
152
|
resp.setId(sizePoolId);
|
153
|
resp.setRangeType(sizePool.getRangeType());
|
153
|
resp.setRangeType(sizePool.getRangeType());
|
|
|
154
|
+ resp.setImageUrl(sizePool.getImageUrl());
|
154
|
buildImageResp(resp, imageList);
|
155
|
buildImageResp(resp, imageList);
|
155
|
buildResp(resp, list);
|
156
|
buildResp(resp, list);
|
156
|
return resp;
|
157
|
return resp;
|
157
|
}
|
158
|
}
|
158
|
|
159
|
|
159
|
private void buildImageResp(SizePoolResp resp, List<SizePoolImage> imageList) {
|
160
|
private void buildImageResp(SizePoolResp resp, List<SizePoolImage> imageList) {
|
|
|
161
|
+ if(CollectionUtils.isEmpty(imageList)) {
|
|
|
162
|
+ return;
|
|
|
163
|
+ }
|
160
|
List<SizePoolImageBo> list = Lists.newArrayList();
|
164
|
List<SizePoolImageBo> list = Lists.newArrayList();
|
161
|
for(SizePoolImage item : imageList) {
|
165
|
for(SizePoolImage item : imageList) {
|
162
|
SizePoolImageBo image = new SizePoolImageBo();
|
166
|
SizePoolImageBo image = new SizePoolImageBo();
|
|
@@ -212,6 +216,7 @@ public class SizePoolService implements ISizePoolService{ |
|
@@ -212,6 +216,7 @@ public class SizePoolService implements ISizePoolService{ |
212
|
resp.setStatus(pool.getStatus());
|
216
|
resp.setStatus(pool.getStatus());
|
213
|
resp.setStatusStr(getStatusStr(pool.getStatus()));
|
217
|
resp.setStatusStr(getStatusStr(pool.getStatus()));
|
214
|
resp.setRangeTypeStr(getRangeTypeStr(pool.getRangeType()));
|
218
|
resp.setRangeTypeStr(getRangeTypeStr(pool.getRangeType()));
|
|
|
219
|
+ resp.setImageUrl(pool.getImageUrl());
|
215
|
buildImageResp(resp, poolIdImageMap.get(pool.getId()));
|
220
|
buildImageResp(resp, poolIdImageMap.get(pool.getId()));
|
216
|
List<SizePoolDetail> itemList = poolIdMap.get(pool.getId());
|
221
|
List<SizePoolDetail> itemList = poolIdMap.get(pool.getId());
|
217
|
if(CollectionUtils.isNotEmpty(itemList)) {
|
222
|
if(CollectionUtils.isNotEmpty(itemList)) {
|