Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-18 97bb97c13ad63c40a8baf73b0f5e08d93c0e7559

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java

@@ -2,17 +2,13 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComSanShuoEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanShuoIndustryCenterVO;
import com.panzhihua.common.model.vos.sanshuo.ExpertShowVO;
import com.panzhihua.common.model.vos.sanshuo.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
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 org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -31,10 +27,10 @@
        return communityService.industryCenterAppList();
    }

    @ApiOperation(value = "小程序获取可选择行专家列表",response = ComSanShuoEventVO.class )
    @GetMapping("/industryCenter/appletsList")
    public R expertAppList(){
        return communityService.expertAppList();
    @ApiOperation(value = "小程序获取可选择行专家列表",response = ComSanshuoExpertVO.class )
    @GetMapping("/expert/appletsList")
    public R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id){
        return communityService.expertAppList(type,id);
    }

    @ApiOperation(value = "专家风采",response = ExpertShowVO.class)
@@ -48,4 +44,23 @@
    public R expertDetail(@PathVariable("id")Long id){
        return communityService.expertDetail(id);
    }

    @ApiOperation(value = "事件类型列表",response = ComMediaTypeVO.class)
    @GetMapping("/mediateType/list")
    public R mediateTypeList(){
        return communityService.eventAppList();
    }

    @ApiOperation(value = "业务中心详情",response = ComSanShuoIndustryCenterVO.class)
    @GetMapping("/industryCenter/detail")
    public R industryCenterDetail(@RequestParam("id") Long id){
        return communityService.industryCenterDetail(id);
    }

    @GetMapping("/expert/expertShowList")
    @ApiOperation(value = "专家风采列表",response = ComSanshuoExpertVO.class)
    public R expertShowList(@RequestParam(value = "level",required = false) @ApiParam("对应的level，1三说会堂2行业分中心3街道4社区")Integer level,
                            @RequestParam(value = "id",required = false) @ApiParam("id，level=1不传2行业分中心id 3街道id 4社区id")Long id){
        return communityService.expertShowList(level,id);
    }
}