From 49d46c391afa5d033e65acbfeef8c2107073924f Mon Sep 17 00:00:00 2001 From: sj <1304317391@qq.com> Date: Fri, 14 Oct 2022 16:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=93=E5=AE=B6=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/AppStoreEvaluationController.java | 2 +- .../evaluation/service/YxEvaluationService.java | 11 ++++++----- .../service/impl/YxEvaluationServiceImpl.java | 15 +++++++++------ .../modules/expert/domain/YxStoreExpert.java | 3 --- .../expert/service/dto/YxStoreExpertDto.java | 4 ---- .../service/impl/YxStoreExpertServiceImpl.java | 2 -- .../main/java/co/yixiang/utils/EvaluationDTO.java | 9 +++++++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java index ca29619d..c66f845b 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java @@ -55,7 +55,7 @@ public class AppStoreEvaluationController { * 首页点击查询评测 */ @AnonymousAccess - @GetMapping("/evaluation{id}") + @GetMapping("/evaluation/{id}") @ApiOperation(value = "评测查询",notes = "产品评测") public ApiResult getYxEvaluation(@PathVariable int id){ EvaluationDTO evaluationDTO=yxEvaluationService.getEvaluationById(id); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java index 88db7b59..93458549 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java @@ -49,14 +49,15 @@ public interface YxEvaluationService extends BaseService { */ void download(List all, HttpServletResponse response) throws IOException; - /** - * 后台获取评测列表 - * @return + /*** + * app首页获取评测列表 */ List getList(); - /*** - * app首页获取评测列表 + + /** + * 后台获取评测列表 + * @return */ List getList(int page, int limit); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java index e087d8d8..6fe923a1 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java @@ -47,10 +47,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; + /** * @author hupeng * @date 2022-09-21 @@ -133,12 +131,15 @@ public class YxEvaluationServiceImpl extends BaseServiceImpl{ YxStoreProduct yxStoreProduct = yxStoreProductService.getProductInfo(Long.valueOf(evaluationDTO.getProduct())); evaluationDTO.setProductInfo(yxStoreProduct); + evaluationDTO.setAccessibilityImageArr(Arrays.asList(evaluationDTO.getAccessibilityImage().split(","))); + evaluationDTO.setDisplayImageArr(Arrays.asList(evaluationDTO.getDisplayImage().split(","))); + evaluationDTO.setFeelImageArr(Arrays.asList(evaluationDTO.getFeelImage().split(","))); }); return list; } /** - * app首页评测列表 + *评测列表 * @return List */ @Override @@ -163,7 +164,9 @@ public class YxEvaluationServiceImpl extends BaseServiceImpl list = generator.convert(baseMapper.selectList(wrapper),ExpertDTO.class); -// return TreeUtil.list2TreeConverter(list,0); //没有父类，不需要树形 return list; } @@ -81,7 +80,6 @@ public class YxStoreExpertServiceImpl extends BaseServiceImpl> list = new ArrayList<>(); for (YxStoreExpertDto yxStoreExpert : all) { Map map = new LinkedHashMap<>(); - map.put("商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)", yxStoreExpert.getMerId()); map.put("专家人像大图", yxStoreExpert.getImage()); map.put("专家名称", yxStoreExpert.getExpertName()); map.put("专家简介", yxStoreExpert.getExpertInfo()); diff --git a/zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java b/zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java index a861fcc4..1d271636 100644 --- a/zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java +++ b/zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java @@ -53,9 +53,11 @@ public class EvaluationDTO implements Serializable { private String summary; - /** 产品展示图集 */ + /** 产品展示图 */ private String displayImage; + /** 产品展示图集 */ + private List displayImageArr; /** 产品展示文字 */ private String displaySynopsis; @@ -63,6 +65,8 @@ public class EvaluationDTO implements Serializable { /** 实用体验感受图 */ private String feelImage; + /** 实用体验感受图集 */ + private List feelImageArr; /** 使用体验感受文字 */ @@ -71,7 +75,8 @@ public class EvaluationDTO implements Serializable { /** 易用性体验图 */ private String accessibilityImage; - + /** 易用性体验图 */ + private List accessibilityImageArr; /** 易用性体验文字 */ private String accessibilitySynopsis;