diff --git a/jzo2o-api/src/main/java/com/jzo2o/api/foundations/ServeApi.java b/jzo2o-api/src/main/java/com/jzo2o/api/foundations/ServeApi.java index 374f6cb..a9f1aa7 100644 --- a/jzo2o-api/src/main/java/com/jzo2o/api/foundations/ServeApi.java +++ b/jzo2o-api/src/main/java/com/jzo2o/api/foundations/ServeApi.java @@ -4,14 +4,16 @@ import com.jzo2o.api.foundations.dto.response.ServeAggregationResDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; +/** + * 内部接口 - 服务相关接口 + * @author JIAN + */ @FeignClient(contextId = "jzo2o-foundations", value = "jzo2o-foundations", path = "/foundations/inner/serve") public interface ServeApi { - + /** + * 根据服务id获取服务信息 + */ @GetMapping("/{id}") ServeAggregationResDTO findById(@PathVariable("id") Long id); - -} +} \ No newline at end of file diff --git a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/controller/inner/InnerServeController.java b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/controller/inner/InnerServeController.java new file mode 100644 index 0000000..fd79158 --- /dev/null +++ b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/controller/inner/InnerServeController.java @@ -0,0 +1,32 @@ +package com.jzo2o.foundations.controller.inner; + +import com.jzo2o.api.foundations.ServeApi; +import com.jzo2o.api.foundations.dto.response.ServeAggregationResDTO; +import com.jzo2o.foundations.service.IServeService; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author JIAN + */ +@RestController +@RequestMapping("/inner/serve") +@Api(tags = "内部接口 - 服务相关接口") +public class InnerServeController implements ServeApi { + @Resource + private IServeService serveService; + + /** + * 根据服务id获取服务信息 + */ + @Override + @GetMapping("/{id}") + public ServeAggregationResDTO findById(@PathVariable Long id) { + return serveService.getServeAggregationById(id); + } +} \ No newline at end of file diff --git a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/mapper/ServeMapper.java b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/mapper/ServeMapper.java index 4947ee0..2962a5c 100644 --- a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/mapper/ServeMapper.java +++ b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/mapper/ServeMapper.java @@ -1,6 +1,7 @@ package com.jzo2o.foundations.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jzo2o.api.foundations.dto.response.ServeAggregationResDTO; import com.jzo2o.foundations.model.domain.Serve; import com.jzo2o.foundations.model.dto.response.ServeAggregationSimpleResDTO; import com.jzo2o.foundations.model.dto.response.ServeCategoryResDTO; @@ -34,4 +35,9 @@ public interface ServeMapper extends BaseMapper { * @param regionId 区域id */ List queryHotServeListByRegionId(Long regionId); + + /** + * 查询指定id的服务信息 + */ + ServeAggregationResDTO getServeAggregationById(Long id); } \ No newline at end of file diff --git a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/IServeService.java b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/IServeService.java index 2fc795d..f4a3600 100644 --- a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/IServeService.java +++ b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/IServeService.java @@ -1,6 +1,7 @@ package com.jzo2o.foundations.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.jzo2o.api.foundations.dto.response.ServeAggregationResDTO; import com.jzo2o.common.model.PageResult; import com.jzo2o.foundations.model.domain.Serve; import com.jzo2o.foundations.model.dto.request.ServePageQueryReqDTO; @@ -86,4 +87,9 @@ public interface IServeService extends IService { * 查询指定区域的服务 */ List findServeList(String cityCode, Long serveTypeId, String keyword); + + /** + * 获取指定id的服务 + */ + ServeAggregationResDTO getServeAggregationById(Long id); } \ No newline at end of file diff --git a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/impl/ServeServiceImpl.java b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/impl/ServeServiceImpl.java index 340b5cc..18bb20f 100644 --- a/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/impl/ServeServiceImpl.java +++ b/jzo2o-foundations/src/main/java/com/jzo2o/foundations/service/impl/ServeServiceImpl.java @@ -5,6 +5,7 @@ import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.SearchResponse; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; +import com.jzo2o.api.foundations.dto.response.ServeAggregationResDTO; import com.jzo2o.common.expcetions.CommonException; import com.jzo2o.common.expcetions.ForbiddenOperationException; import com.jzo2o.common.model.PageResult; @@ -380,6 +381,11 @@ public class ServeServiceImpl extends ServiceImpl implements } } + @Override + public ServeAggregationResDTO getServeAggregationById(Long id) { + return baseMapper.getServeAggregationById(id); + } + @Resource private IRegionService regionService; @Resource diff --git a/jzo2o-foundations/src/main/resources/mapper/ServeMapper.xml b/jzo2o-foundations/src/main/resources/mapper/ServeMapper.xml index 6d47c61..252fa0d 100644 --- a/jzo2o-foundations/src/main/resources/mapper/ServeMapper.xml +++ b/jzo2o-foundations/src/main/resources/mapper/ServeMapper.xml @@ -71,4 +71,30 @@ AND serve.is_hot = 1 # 保证热门状态 ORDER BY item.sort_num + + \ No newline at end of file