Browse Source

为了RamApplication的调试进行的修改,还有错误请帮忙看一下问题

master
yxt_njy 2 years ago
parent
commit
7f8c2d44dc
  1. 2
      yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customerordergoods/CustomerOrderGoodsFeign.java
  2. 2
      yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplier/CustomerSupplierFeign.java
  3. 2
      yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/customersupplierindex/CustomerSupplierIndexFeign.java
  4. 40
      yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeign.java
  5. 44
      yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/restrictedcategory/RestrictedCategoryFeignFallback.java
  6. 18
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/RmsApplication.java
  7. 2
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/customersupplierindex/CustomerSupplierIndexRest.java
  8. 4
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportRest.java
  9. 1
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandRest.java
  10. 1
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandService.java
  11. 127
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryRest.java
  12. 9
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/AppConstant.java
  13. 36
      yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/Swagger2Config.java

2
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 = "风险表") @Api(tags = "风险表")
@FeignClient( @FeignClient(
contextId = "yxt-supervise-CustomerOrder", contextId = "yxt-supervise-CustomerOrderGoods",
name = "yxt-supervise", name = "yxt-supervise",
path = "v1/risk", path = "v1/risk",
fallback = CustomerOrderGoodsFeignFallback.class) fallback = CustomerOrderGoodsFeignFallback.class)

2
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 = "风险表") @Api(tags = "风险表")
@FeignClient( @FeignClient(
contextId = "yxt-supervise-CustomerOrder", contextId = "yxt-supervise-CustomerSupplier",
name = "yxt-supervise", name = "yxt-supervise",
path = "v1/risk", path = "v1/risk",
fallback = CustomerSupplierFeignFallback.class) fallback = CustomerSupplierFeignFallback.class)

2
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 = "风险表") @Api(tags = "风险表")
@FeignClient( @FeignClient(
contextId = "yxt-supervise-CustomerOrder", contextId = "yxt-supervise-CustomerSupplierIndex",
name = "yxt-supervise", name = "yxt-supervise",
path = "v1/risk", path = "v1/risk",
fallback = CustomerSupplierIndexFeignFallback.class) fallback = CustomerSupplierIndexFeignFallback.class)

40
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", path = "v1/restrictedcategory",
fallback = RestrictedCategoryFeignFallback.class) fallback = RestrictedCategoryFeignFallback.class)
public interface RestrictedCategoryFeign { public interface RestrictedCategoryFeign {
//
@ApiOperation("根据条件分页查询数据的列表") // @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") // @PostMapping("/listPage")
@ResponseBody // @ResponseBody
public ResultBean<PagerVo<RestrictedCategoryVo>> listPage(@RequestBody PagerQuery<RestrictedCategoryQuery> pq); // public ResultBean<PagerVo<RestrictedCategoryVo>> listPage(@RequestBody PagerQuery<RestrictedCategoryQuery> pq);
//
@ApiOperation("新增或修改") // @ApiOperation("新增或修改")
@PostMapping("/save") // @PostMapping("/save")
@ResponseBody // @ResponseBody
public ResultBean save(@RequestBody RestrictedCategoryDto dto); // public ResultBean save(@RequestBody RestrictedCategoryDto dto);
//
@ApiOperation("根据sid删除记录") // @ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids") // @DeleteMapping("/delBySids")
@ResponseBody // @ResponseBody
public ResultBean delBySids(@RequestBody String[] sids); // public ResultBean delBySids(@RequestBody String[] sids);
//
@ApiOperation("根据SID获取一条记录") // @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") // @GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody // @ResponseBody
public ResultBean<RestrictedCategoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid); // public ResultBean<RestrictedCategoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
} }

44
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 @Component
public class RestrictedCategoryFeignFallback implements RestrictedCategoryFeign { public class RestrictedCategoryFeignFallback implements RestrictedCategoryFeign {
//
@Override // @Override
public ResultBean<PagerVo<RestrictedCategoryVo>> listPage(PagerQuery<RestrictedCategoryQuery> pq){ // public ResultBean<PagerVo<RestrictedCategoryVo>> listPage(PagerQuery<RestrictedCategoryQuery> pq){
ResultBean rb = ResultBean.fireFail(); // ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口yxt-supervise/restrictedcategory/listPage无法访问"); // return rb.setMsg("接口yxt-supervise/restrictedcategory/listPage无法访问");
} // }
//
@Override // @Override
public ResultBean save(RestrictedCategoryDto dto){ // public ResultBean save(RestrictedCategoryDto dto){
return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/save无法访问"); // return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/save无法访问");
} // }
//
@Override // @Override
public ResultBean delBySids( String[] sids){ // public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/delBySids无法访问"); // return ResultBean.fireFail().setMsg("接口yxt-supervise/restrictedcategory/delBySids无法访问");
} // }
//
@Override // @Override
public ResultBean<RestrictedCategoryDetailsVo> fetchDetailsBySid(String sid){ // public ResultBean<RestrictedCategoryDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail(); // ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口yxt-supervise/restrictedcategory/fetchDetailsBySid无法访问"); // return rb.setMsg("接口yxt-supervise/restrictedcategory/fetchDetailsBySid无法访问");
} // }
} }

18
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);
}
}

2
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; import org.springframework.web.bind.annotation.RestController;
@Api(tags = "风险名单表") @Api(tags = "风险名单表")
@RestController("com.supervise.rmc.biz.risk.RiskRest") @RestController("com.supervise.rmc.biz.customersupplierindex.CustomerSupplierIndexRest")
@RequestMapping("v1/risk") @RequestMapping("v1/risk")
public class CustomerSupplierIndexRest implements RiskFeign { public class CustomerSupplierIndexRest implements RiskFeign {

4
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; import org.springframework.web.bind.annotation.RestController;
@Api(tags = "风险名单表") @Api(tags = "风险名单表")
@RestController("com.supervise.rmc.biz.risk.RiskRest") @RestController("com.supervise.rmc.biz.datareport.DataReportRest")
@RequestMapping("v1/risk") @RequestMapping("v1/dataReport")
public class DataReportRest implements RiskFeign { public class DataReportRest implements RiskFeign {
} }

1
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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.portal.api.restrictedbrand.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

1
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.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.portal.api.restrictedbrand.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCell;

127
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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.supervise.portal.api.restrictedcategory.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -60,68 +59,68 @@ import java.io.InputStream;
@RequestMapping("v1/restrictedcategory") @RequestMapping("v1/restrictedcategory")
public class RestrictedCategoryRest implements RestrictedCategoryFeign { public class RestrictedCategoryRest implements RestrictedCategoryFeign {
@Autowired // @Autowired
private RestrictedCategoryService restrictedCategoryService; // private RestrictedCategoryService restrictedCategoryService;
//
// @Override
// @ApiOperation("根据条件分页查询数据的列表")
// @PostMapping("/listPage")
// public ResultBean<PagerVo<RestrictedCategoryVo>> listPage(@RequestBody PagerQuery<RestrictedCategoryQuery> pq){
// ResultBean rb = ResultBean.fireFail();
// PagerVo<RestrictedCategoryVo> 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 // @Override
@ApiOperation("根据条件分页查询数据的列表") // @ApiOperation("根据sid批量删除")
@PostMapping("/listPage") // @PostMapping("/delBySids")
public ResultBean<PagerVo<RestrictedCategoryVo>> listPage(@RequestBody PagerQuery<RestrictedCategoryQuery> pq){ // public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail(); // ResultBean rb = ResultBean.fireFail();
PagerVo<RestrictedCategoryVo> pv = restrictedCategoryService.listPageVo(pq); // restrictedCategoryService.delBySids(sids);
return rb.success().setData(pv); // return rb.success();
} // }
//
@Override // @Override
@ApiOperation("新增或修改") // @ApiOperation("根据SID获取一条记录")
@PostMapping("/save") // @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean save(@RequestBody RestrictedCategoryDto dto){ // public ResultBean<RestrictedCategoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail(); // ResultBean rb = ResultBean.fireFail();
restrictedCategoryService.saveOrUpdateDto(dto); // RestrictedCategoryDetailsVo vo = restrictedCategoryService.fetchDetailsVoBySid(sid);
return rb.success(); // return rb.success().setData(vo);
} // }
// @ApiOperation(" ")
@Override // @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST)
@ApiOperation("根据sid批量删除") // public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file,
@PostMapping("/delBySids") // HttpServletRequest request, HttpServletResponse response){
public ResultBean delBySids(@RequestBody String[] sids){ // ResultBean rb = ResultBean.fireFail();
ResultBean rb = ResultBean.fireFail(); // String temp = request.getSession().getServletContext()
restrictedCategoryService.delBySids(sids); // .getRealPath(File.separator)
return rb.success(); // + "temp"; // 临时目录
} // File tempFile = new File(temp);
// if (!tempFile.exists()) {
@Override // tempFile.mkdirs();
@ApiOperation("根据SID获取一条记录") // }
@GetMapping("/fetchDetailsBySid/{sid}") // String name = file.getOriginalFilename();// 获取上传文件名,包括路径
public ResultBean<RestrictedCategoryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ // long size = file.getSize();
ResultBean rb = ResultBean.fireFail(); // if ((name == null || name.equals("")) && size == 0)
RestrictedCategoryDetailsVo vo = restrictedCategoryService.fetchDetailsVoBySid(sid); // return null;
return rb.success().setData(vo); // InputStream in = null;
} // try {
@ApiOperation(" ") // in = file.getInputStream();
@RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) // } catch (IOException e) {
public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, // e.printStackTrace();
HttpServletRequest request, HttpServletResponse response){ // }
ResultBean rb = ResultBean.fireFail(); // //inventoryInformationService.readBrandPeriodSorXls1(in,"");
String temp = request.getSession().getServletContext() // restrictedCategoryService.readBrandPeriodSorXls1(in,"");
.getRealPath(File.separator) // return rb;
+ "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;
}
} }

9
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";
}

36
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();
}
}
Loading…
Cancel
Save