From 2fea1cc7bda03f8e49c0ca2878fa0520d152fcaf Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Wed, 13 Dec 2023 17:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmCoBankController.java | 1 + .../controller/BmCompanyInfoController.java | 2 +- .../controller/BmCompanyTypeController.java | 2 +- .../controller/BusinessOpenController.java | 2 +- .../ServiceGreementInfoController.java | 2 +- .../impl/BmCompanyInfoServiceImpl.java | 11 ++++- .../file/service/MinioSysFileServiceImpl.java | 42 +++++++++---------- 7 files changed, 35 insertions(+), 27 deletions(-) diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCoBankController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCoBankController.java index 7389770..73519b0 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCoBankController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCoBankController.java @@ -3,6 +3,7 @@ import com.bonus.zlpt.company.api.domain.BmCoBank; import com.bonus.zlpt.company.service.impl.BmCoBankServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; + import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java index 61436f8..475dee5 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java @@ -139,7 +139,7 @@ public class BmCompanyInfoController extends BaseController { * 企业入驻信息导出 * @param */ - @GetMapping("/exportExcel") + @PostMapping("/exportExcel") @ApiOperation("企业入驻信息导出") public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException { diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java index 3c6b026..ab1cd89 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java @@ -138,7 +138,7 @@ public class BmCompanyTypeController extends BaseController { * 企业类型导出 * @param */ - @GetMapping("/exportExcel") + @PostMapping("/exportExcel") @ApiOperation("企业类型导出") public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException { diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java index 34d4e5e..8416a3a 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java @@ -79,7 +79,7 @@ public class BusinessOpenController extends BaseController { * 企业业务开通数据导出 * @param response */ - @GetMapping("/exportExcel") + @PostMapping("/exportExcel") @ApiOperation("企业业务开通数据导出") public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException { diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java index 11cc0a5..d30fa38 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java @@ -80,7 +80,7 @@ public class ServiceGreementInfoController extends BaseController { * @param response * @param */ - @GetMapping("/export") + @PostMapping("/export") @ApiOperation("导出隐私协议模板信息") public void expPrivacyAgreementTemplate(HttpServletResponse response) throws UnsupportedEncodingException { ExcelUtil util = new ExcelUtil<>(ServiceGreementVo.class); diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java index 05ff414..edff89f 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java @@ -97,8 +97,15 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { List bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto); for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) { - bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType()))); - bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd()))); + + System.err.println(bmCompanyInfo.getCompanyType()); + System.err.println(bmCompanyInfo.getCompanyLtd()); + if(bmCompanyInfo.getCompanyType() !=null){ + bmCompanyInfo.setCompanyType(CompanyTypeEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyType()))); + } + if(bmCompanyInfo.getCompanyLtd() !=null){ + bmCompanyInfo.setCompanyLtd(CompanyLtdEnum.getNameByCode(Integer.parseInt(bmCompanyInfo.getCompanyLtd()))); + } SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData(); bmCompanyInfo.setUserName(data.getUserName()); } diff --git a/zlpt-modules/zlpt-file/src/main/java/com/bonus/zlpt/file/service/MinioSysFileServiceImpl.java b/zlpt-modules/zlpt-file/src/main/java/com/bonus/zlpt/file/service/MinioSysFileServiceImpl.java index 14d2a3f..97d5815 100644 --- a/zlpt-modules/zlpt-file/src/main/java/com/bonus/zlpt/file/service/MinioSysFileServiceImpl.java +++ b/zlpt-modules/zlpt-file/src/main/java/com/bonus/zlpt/file/service/MinioSysFileServiceImpl.java @@ -15,14 +15,13 @@ // * // * @author ruoyi // */ -//@Service -//public class MinioSysFileServiceImpl implements ISysFileService -//{ +////@Service +//public class MinioSysFileServiceImpl implements ISysFileService { //// @Autowired //// private MinioConfig minioConfig; // -// @Autowired -// private MinioClient client; +//// @Autowired +//// private MinioClient client; // // /** // * Minio文件上传接口 @@ -31,19 +30,20 @@ // * @return 访问地址 // * @throws Exception // */ -// @Override -// public String uploadFile(MultipartFile file) throws Exception -// { -// String fileName = FileUploadUtils.extractFilename(file); -// InputStream inputStream = file.getInputStream(); -// PutObjectArgs args = PutObjectArgs.builder() -// .bucket(minioConfig.getBucketName()) -// .object(fileName) -// .stream(inputStream, file.getSize(), -1) -// .contentType(file.getContentType()) -// .build(); -// client.putObject(args); -// IoUtils.closeQuietly(inputStream); -// return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; -// } -//} +//// @Override +//// public String uploadFile(MultipartFile file) throws Exception +//// { +//// String fileName = FileUploadUtils.extractFilename(file); +//// InputStream inputStream = file.getInputStream(); +//// PutObjectArgs args = PutObjectArgs.builder() +//// .bucket(minioConfig.getBucketName()) +//// .object(fileName) +//// .stream(inputStream, file.getSize(), -1) +//// .contentType(file.getContentType()) +//// .build(); +//// client.putObject(args); +//// IoUtils.closeQuietly(inputStream); +//// return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; +//// } +////} +//} \ No newline at end of file