|
@@ -25,7 +25,9 @@ import org.springframework.web.multipart.MultipartFile;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
import java.util.UUID;
|
|
import java.util.UUID;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -205,9 +207,25 @@ public class PhotoServiceImpl extends BaseService implements PhotoService {
|
|
PhotoPo middlePhoto = photoMapper.getHomePageMiddlePhoto();
|
|
PhotoPo middlePhoto = photoMapper.getHomePageMiddlePhoto();
|
|
PhotoVo middlePhotoVo = new PhotoVo();
|
|
PhotoVo middlePhotoVo = new PhotoVo();
|
|
BeanUtil.copyProperties(middlePhotoVo, middlePhoto);
|
|
BeanUtil.copyProperties(middlePhotoVo, middlePhoto);
|
|
|
|
+ if (middlePhoto.getUrl() != null) {
|
|
|
|
+ String url = accessPath + accessResource + middlePhoto.getUrl().replace("/","");
|
|
|
|
+ middlePhotoVo.setUrl(url);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ List<PhotoPo> homePageMainPhotos = photoMapper.getHomePageMainPhotos();
|
|
|
|
+ List<PhotoVo> mainPhotos = new ArrayList<>();
|
|
|
|
+ for (PhotoPo po : homePageMainPhotos) {
|
|
|
|
+ PhotoVo vo = new PhotoVo();
|
|
|
|
+ BeanUtil.copyProperties(vo, po);
|
|
|
|
+ if (po.getUrl() != null) {
|
|
|
|
+ String url = accessPath + accessResource + po.getUrl().replace("/","");
|
|
|
|
+ vo.setUrl(url);
|
|
|
|
+ }
|
|
|
|
+ mainPhotos.add(vo);
|
|
|
|
+ }
|
|
|
|
|
|
- result.put("1", photoMapper.getHomePageMainPhotos());
|
|
|
|
- result.put("2", photoMapper.getHomePageMiddlePhoto());
|
|
|
|
|
|
+ result.put("1", mainPhotos);
|
|
|
|
+ result.put("2", middlePhotoVo);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
}
|
|
}
|