From ef73ad07a83293f136197dd46278c293de71d30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E7=94=9A=E6=B4=8B?= Date: Mon, 2 Dec 2024 16:51:54 +0800 Subject: [PATCH] feign --- servers/boe-server-all/pom.xml | 5 +++ .../com/xboe/module/boecase/api/CasesApi.java | 18 +++++++++-- .../module/boecase/dao/CasesRecordDao.java | 1 - .../com/xboe/module/boecase/dto/CaseVo.java | 32 ------------------- .../xboe/module/boecase/dto/CasesFiledVo.java | 21 ------------ .../module/boecase/service/ICasesService.java | 6 ++-- .../service/impl/CasesServiceImpl.java | 2 ++ 7 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CaseVo.java delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 9ecd6fb2..5b448773 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -24,6 +24,11 @@ boe-springcloud ${xboe.version} + + com.xboe + xboe-feign-api + ${xboe.version} + org.springframework.boot spring-boot-configuration-processor diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 1fdce29b..fdd6da94 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -6,6 +6,9 @@ import java.util.stream.Collectors; import javax.annotation.Resource; +import com.boe.feign.api.serverall.entity.CaseVo; +import com.boe.feign.api.serverall.entity.CasesFiledVo; +import com.boe.feign.api.serverall.reps.CasesReps; import com.xboe.core.orm.FieldFilters; import com.xboe.module.boecase.dao.CasesMajorTypeDao; import com.xboe.module.boecase.dto.*; @@ -17,6 +20,7 @@ import com.xboe.module.excel.ExportsExcelSenderUtil; import com.xboe.system.user.dao.UserDao; import com.xboe.system.user.entity.User; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -372,11 +376,15 @@ public class CasesApi extends ApiBaseController { } } + /** * 案例详情 + * @param id id + * @param addView 是否记录查看次数 + * @return JsonResponse */ @GetMapping("/detail") - public JsonResponse selectById(String id, Boolean addView) { + public JsonResponse selectById(String id, Boolean addView) { if (StringUtil.isBlank(id)) { return badRequest("参数错误"); } @@ -386,11 +394,15 @@ public class CasesApi extends ApiBaseController { } try { Cases cases = casesService.selectById(id, addView); - + if (cases == null){ + return badRequest("当前案例不存在"); + } if (cases.getDeleted()) { return badRequest("当前案例已被删除"); } - return success(cases); + CasesReps reps=new CasesReps(); + BeanUtils.copyProperties(cases,reps); + return success(reps); } catch (Exception e) { log.error("查看案例失败", e); return error("查看失败", e.getMessage()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java index 7d0ae946..b7963524 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java @@ -1,7 +1,6 @@ package com.xboe.module.boecase.dao; import com.xboe.module.boecase.dto.CasePageVo; -import com.xboe.module.boecase.dto.CaseVo; import com.xboe.module.boecase.entity.Cases; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CaseVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CaseVo.java deleted file mode 100644 index 0bba352e..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CaseVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xboe.module.boecase.dto; - -import lombok.Data; - -@Data -public class CaseVo { - - - private String keyWord; - - private Boolean breCommend; - - private String orderField; - - private Boolean orderAsc; - - private String orgDomain;//后台查询一级 - - private String majorType; - - private Boolean isTop; - - private String caseType; - - private Boolean excellent; - - - private String authorName; - - - -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java deleted file mode 100644 index 108bc494..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.xboe.module.boecase.dto; - -import lombok.Data; - -@Data -public class CasesFiledVo { - - private String id; - - private String companyId; - - private String coverUrl; - - private String title; - - private String authorId; - - private String authorName; - - private Boolean excellent; -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java index b114932e..3ece183c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java @@ -1,5 +1,7 @@ package com.xboe.module.boecase.service; +import com.boe.feign.api.serverall.entity.CaseVo; +import com.boe.feign.api.serverall.entity.CasesFiledVo; import com.xboe.common.PageList; import com.xboe.core.CurrentUser; import com.xboe.module.boecase.dto.*; @@ -28,7 +30,7 @@ public interface ICasesService{ /** * 案例管理列表搜索 * */ - PageList managerList(int pageIndex,int pageSize,CaseVo caseVo); + PageList managerList(int pageIndex, int pageSize, CaseVo caseVo); List exportCase(CaseVo caseVo); @@ -37,7 +39,7 @@ public interface ICasesService{ /** * 案例分页 * */ - PageList queryList(int pageIndex,int pageSize,CaseVo caseVo); + PageList queryList(int pageIndex, int pageSize, CaseVo caseVo); /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index d7bff60a..a84fab52 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -6,6 +6,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.boe.feign.api.serverall.entity.CaseVo; +import com.boe.feign.api.serverall.entity.CasesFiledVo; import com.xboe.api.ThirdApi; import com.xboe.api.vo.UserDynamic; import com.xboe.api.vo.UserDynamicResult;