diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java index c3bd696eb..1401b915f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java @@ -5,6 +5,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; import com.iformall.service.WxBusinessService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -18,6 +19,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("wxBusiness") +@Api(description = "业态接口") public class WxBusinessController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -47,6 +49,15 @@ public class WxBusinessController extends BaseController { return new ResultData(busList2); } + @ApiOperation("业态全列表接口") + @GetMapping("allist") + public ResultData getAllList(@ModelAttribute WxBusiness wxBusiness) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); + if (null == wxBusiness) wxBusiness = new WxBusiness(); + final List busList = wxBusinessService.getList(wxBusiness); + return new ResultData(busList); + } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBusiness wxBusiness) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index 444c57f1f..3d6094b1a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -13,9 +13,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.stream.Collectors; + @RestController @RequestMapping("/api/wxBusiness") @Api(description = "业态查询接口") @@ -36,4 +40,22 @@ public class WxBusinessController extends BaseController { final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } + + @ApiOperation("成长值业态列表接口") + @GetMapping("busListForScore") + public ResultData getList(@ModelAttribute WxBusiness wxBusiness) { + if (null == wxBusiness) wxBusiness = new WxBusiness(); + final List busList = wxBusinessService.getList(wxBusiness); + // 业态 全部 不返回 + List busList2 = busList.stream().filter(b -> !b.getId().equals(0L)).collect(Collectors.toList()); + return new ResultData(busList2); + } + + @ApiOperation("业态全列表接口") + @GetMapping("allist") + public ResultData getAllList(@ModelAttribute WxBusiness wxBusiness) { + if (null == wxBusiness) wxBusiness = new WxBusiness(); + final List busList = wxBusinessService.getList(wxBusiness); + return new ResultData(busList); + } }