From 7f8c2d44dc6455465eee5f5f399cc3f69a0a4e82 Mon Sep 17 00:00:00 2001 From: yxt_njy <119782786@qq.com> Date: Fri, 10 Feb 2023 00:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86RamApplication=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E8=BF=9B=E8=A1=8C=E7=9A=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E8=BF=98=E6=9C=89=E9=94=99=E8=AF=AF=E8=AF=B7=E5=B8=AE?= =?UTF-8?q?=E5=BF=99=E7=9C=8B=E4=B8=80=E4=B8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerOrderGoodsFeign.java | 2 +- .../CustomerSupplierFeign.java | 2 +- .../CustomerSupplierIndexFeign.java | 2 +- .../RestrictedCategoryFeign.java | 40 +++--- .../RestrictedCategoryFeignFallback.java | 44 +++--- .../com/supervise/rms/RmsApplication.java | 18 +++ .../CustomerSupplierIndexRest.java | 2 +- .../rms/biz/datareport/DataReportRest.java | 4 +- .../restrictedbrand/RestrictedBrandRest.java | 1 - .../RestrictedBrandService.java | 1 - .../RestrictedCategoryRest.java | 127 +++++++++--------- .../com/supervise/rms/config/AppConstant.java | 9 ++ .../supervise/rms/config/Swagger2Config.java | 36 +++++ 13 files changed, 174 insertions(+), 114 deletions(-) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/RmsApplication.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/AppConstant.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/Swagger2Config.java diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customerordergoods/CustomerOrderGoodsFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customerordergoods/CustomerOrderGoodsFeign.java index aed63f61..369a9ce3 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customerordergoods/CustomerOrderGoodsFeign.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customerordergoods/CustomerOrderGoodsFeign.java @@ -5,7 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient; @Api(tags = "风险表") @FeignClient( - contextId = "yxt-supervise-CustomerOrder", + contextId = "yxt-supervise-CustomerOrderGoods", name = "yxt-supervise", path = "v1/risk", fallback = CustomerOrderGoodsFeignFallback.class) diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java index 0eb79c28..e2c6c02c 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java @@ -5,7 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient; @Api(tags = "风险表") @FeignClient( - contextId = "yxt-supervise-CustomerOrder", + contextId = "yxt-supervise-CustomerSupplier", name = "yxt-supervise", path = "v1/risk", fallback = CustomerSupplierFeignFallback.class) diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java index f3e0b7a8..a547bd52 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java @@ -5,7 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient; @Api(tags = "风险表") @FeignClient( - contextId = "yxt-supervise-CustomerOrder", + contextId = "yxt-supervise-CustomerSupplierIndex", name = "yxt-supervise", path = "v1/risk", fallback = CustomerSupplierIndexFeignFallback.class) diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeign.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeign.java index 23be71cb..e44c3fab 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeign.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeign.java @@ -53,24 +53,24 @@ import org.springframework.web.bind.annotation.*; path = "v1/restrictedcategory", fallback = RestrictedCategoryFeignFallback.class) public interface RestrictedCategoryFeign { - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody RestrictedCategoryDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +// +// @ApiOperation("根据条件分页查询数据的列表") +// @PostMapping("/listPage") +// @ResponseBody +// public ResultBean> listPage(@RequestBody PagerQuery pq); +// +// @ApiOperation("新增或修改") +// @PostMapping("/save") +// @ResponseBody +// public ResultBean save(@RequestBody RestrictedCategoryDto dto); +// +// @ApiOperation("根据sid删除记录") +// @DeleteMapping("/delBySids") +// @ResponseBody +// public ResultBean delBySids(@RequestBody String[] sids); +// +// @ApiOperation("根据SID获取一条记录") +// @GetMapping("/fetchDetailsBySid/{sid}") +// @ResponseBody +// public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeignFallback.java index c4a5d947..0cdbdb58 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeignFallback.java +++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeignFallback.java @@ -45,26 +45,26 @@ import org.springframework.stereotype.Component; */ @Component public class RestrictedCategoryFeignFallback implements RestrictedCategoryFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt-supervise/restrictedcategory/listPage无法访问"); - } - - @Override - public ResultBean save(RestrictedCategoryDto dto){ - return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt-supervise/restrictedcategory/fetchDetailsBySid无法访问"); - } +// +// @Override +// public ResultBean> listPage(PagerQuery pq){ +// ResultBean rb = ResultBean.fireFail(); +// return rb.setMsg("接口yxt-supervise/restrictedcategory/listPage无法访问"); +// } +// +// @Override +// public ResultBean save(RestrictedCategoryDto dto){ +// return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/save无法访问"); +// } +// +// @Override +// public ResultBean delBySids( String[] sids){ +// return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/delBySids无法访问"); +// } +// +// @Override +// public ResultBean fetchDetailsBySid(String sid){ +// ResultBean rb = ResultBean.fireFail(); +// return rb.setMsg("接口yxt-supervise/restrictedcategory/fetchDetailsBySid无法访问"); +// } } \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/RmsApplication.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/RmsApplication.java new file mode 100644 index 00000000..82c01424 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/RmsApplication.java @@ -0,0 +1,18 @@ +package com.supervise.rms; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@SpringBootApplication(scanBasePackages = { + "com.supervise.rms", + "com.yxt.common.base.config" +}) +@EnableDiscoveryClient +@EnableFeignClients(basePackages = {}) +public class RmsApplication { + public static void main(String[] args) { + SpringApplication.run(RmsApplication.class, args); + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java index 86d8657c..1d6763a3 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.risk.RiskRest") +@RestController("com.supervise.rmc.biz.customersupplierindex.CustomerSupplierIndexRest") @RequestMapping("v1/risk") public class CustomerSupplierIndexRest implements RiskFeign { diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportRest.java index 86cec80a..ca020c05 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportRest.java @@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api(tags = "风险名单表") -@RestController("com.supervise.rmc.biz.risk.RiskRest") -@RequestMapping("v1/risk") +@RestController("com.supervise.rmc.biz.datareport.DataReportRest") +@RequestMapping("v1/dataReport") public class DataReportRest implements RiskFeign { } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java index 32a77652..61f0eede 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java @@ -29,7 +29,6 @@ import com.supervise.rms.api.restrictedbrand.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.portal.api.restrictedbrand.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandService.java index b20f1309..573c4d49 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandService.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandService.java @@ -35,7 +35,6 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.portal.api.restrictedbrand.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCell; diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryRest.java index b84106d7..fa489da9 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryRest.java +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryRest.java @@ -29,7 +29,6 @@ import com.supervise.rms.api.restrictedcategory.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.supervise.portal.api.restrictedcategory.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -60,68 +59,68 @@ import java.io.InputStream; @RequestMapping("v1/restrictedcategory") public class RestrictedCategoryRest implements RestrictedCategoryFeign { - @Autowired - private RestrictedCategoryService restrictedCategoryService; +// @Autowired +// private RestrictedCategoryService restrictedCategoryService; +// +// @Override +// @ApiOperation("根据条件分页查询数据的列表") +// @PostMapping("/listPage") +// public ResultBean> listPage(@RequestBody PagerQuery pq){ +// ResultBean rb = ResultBean.fireFail(); +// PagerVo pv = restrictedCategoryService.listPageVo(pq); +// return rb.success().setData(pv); +// } +// +// @Override +// @ApiOperation("新增或修改") +// @PostMapping("/save") +// public ResultBean save(@RequestBody RestrictedCategoryDto dto){ +// ResultBean rb = ResultBean.fireFail(); +// restrictedCategoryService.saveOrUpdateDto(dto); +// return rb.success(); +// } - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = restrictedCategoryService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody RestrictedCategoryDto dto){ - ResultBean rb = ResultBean.fireFail(); - restrictedCategoryService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - restrictedCategoryService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - RestrictedCategoryDetailsVo vo = restrictedCategoryService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - @ApiOperation(" ") - @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) - public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, - HttpServletRequest request, HttpServletResponse response){ - ResultBean rb = ResultBean.fireFail(); - String temp = request.getSession().getServletContext() - .getRealPath(File.separator) - + "temp"; // 临时目录 - File tempFile = new File(temp); - if (!tempFile.exists()) { - tempFile.mkdirs(); - } - String name = file.getOriginalFilename();// 获取上传文件名,包括路径 - long size = file.getSize(); - if ((name == null || name.equals("")) && size == 0) - return null; - InputStream in = null; - try { - in = file.getInputStream(); - } catch (IOException e) { - e.printStackTrace(); - } - //inventoryInformationService.readBrandPeriodSorXls1(in,""); - restrictedCategoryService.readBrandPeriodSorXls1(in,""); - return rb; - } +// @Override +// @ApiOperation("根据sid批量删除") +// @PostMapping("/delBySids") +// public ResultBean delBySids(@RequestBody String[] sids){ +// ResultBean rb = ResultBean.fireFail(); +// restrictedCategoryService.delBySids(sids); +// return rb.success(); +// } +// +// @Override +// @ApiOperation("根据SID获取一条记录") +// @GetMapping("/fetchDetailsBySid/{sid}") +// public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ +// ResultBean rb = ResultBean.fireFail(); +// RestrictedCategoryDetailsVo vo = restrictedCategoryService.fetchDetailsVoBySid(sid); +// return rb.success().setData(vo); +// } +// @ApiOperation(" ") +// @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) +// public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, +// HttpServletRequest request, HttpServletResponse response){ +// ResultBean rb = ResultBean.fireFail(); +// String temp = request.getSession().getServletContext() +// .getRealPath(File.separator) +// + "temp"; // 临时目录 +// File tempFile = new File(temp); +// if (!tempFile.exists()) { +// tempFile.mkdirs(); +// } +// String name = file.getOriginalFilename();// 获取上传文件名,包括路径 +// long size = file.getSize(); +// if ((name == null || name.equals("")) && size == 0) +// return null; +// InputStream in = null; +// try { +// in = file.getInputStream(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// //inventoryInformationService.readBrandPeriodSorXls1(in,""); +// restrictedCategoryService.readBrandPeriodSorXls1(in,""); +// return rb; +// } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/AppConstant.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/AppConstant.java new file mode 100644 index 00000000..71215933 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/AppConstant.java @@ -0,0 +1,9 @@ +package com.supervise.rms.config; +/** + * @author niejinyi + * @date 2022/7/16 21:02 + * @description App常量类 + */ +public class AppConstant { + public static String APPID = "402883247a99b2bb017a9ecc4d8d00f6"; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/Swagger2Config.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/Swagger2Config.java new file mode 100644 index 00000000..262664f8 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/Swagger2Config.java @@ -0,0 +1,36 @@ +package com.supervise.rms.config; + +import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author dimengzhe + * @date 2020/9/9 16:42 + * @description + */ +@Configuration +@EnableSwagger2 +@EnableKnife4j +public class Swagger2Config { + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()).select() + .apis(RequestHandlerSelectors.basePackage("com.yyd")) + .paths(PathSelectors.any()).build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder().title("宇运动/活动").description("活动接口").version("1.0") + .build(); + } +}