|
|
@@ -1,20 +1,25 @@
|
|
|
package com.izouma.nineth.web;
|
|
|
|
|
|
+import com.izouma.nineth.domain.UserAssetSummary;
|
|
|
import com.izouma.nineth.domain.UserDetail;
|
|
|
import com.izouma.nineth.dto.MetaRestResult;
|
|
|
import com.izouma.nineth.dto.PageQuery;
|
|
|
+import com.izouma.nineth.dto.PublicShowDTO;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
|
+import com.izouma.nineth.repo.UserAssetSummaryRepo;
|
|
|
import com.izouma.nineth.repo.UserDetailRepo;
|
|
|
import com.izouma.nineth.service.ContentAuditService;
|
|
|
import com.izouma.nineth.service.UserDetailService;
|
|
|
import com.izouma.nineth.utils.excel.ExcelUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
|
|
|
@@ -25,6 +30,7 @@ public class UserDetailController extends BaseController {
|
|
|
private UserDetailService userDetailService;
|
|
|
private UserDetailRepo userDetailRepo;
|
|
|
private ContentAuditService contentAuditService;
|
|
|
+ private UserAssetSummaryRepo userAssetSummaryRepo;
|
|
|
|
|
|
//@PreAuthorize("hasRole('ADMIN')")
|
|
|
@PostMapping("/save")
|
|
|
@@ -70,6 +76,16 @@ public class UserDetailController extends BaseController {
|
|
|
userDetail.setReikiCount(userDetailRepo.findReikiCountById(id));
|
|
|
userDetail.setMedalCount(userDetailRepo.findMedalCountById(id));
|
|
|
userDetail.setPersonalheatCount(userDetailRepo.findPersonalHeatCountById(id));
|
|
|
+ List<UserAssetSummary> userAssetSummaries = userAssetSummaryRepo.findPublicShowAsset(id);
|
|
|
+ List<PublicShowDTO> list = new ArrayList<>();
|
|
|
+ if (CollectionUtils.isEmpty(userAssetSummaries)) {
|
|
|
+ userDetail.setPublicShowDTOs(list);
|
|
|
+ return userDetail;
|
|
|
+ }
|
|
|
+ userAssetSummaries.forEach(userAssetSummary -> {
|
|
|
+ list.add(new PublicShowDTO(userAssetSummary.getName(), userAssetSummary.getPic().get(0).getUrl(), userAssetSummary.getOpenShowNum()));
|
|
|
+ });
|
|
|
+ userDetail.setPublicShowDTOs(list);
|
|
|
return userDetail;
|
|
|
}
|
|
|
|