【更新】代码优化
This commit is contained in:
parent
9c7b61fc39
commit
2fea1cc7bd
|
|
@ -3,6 +3,7 @@ import com.bonus.zlpt.company.api.domain.BmCoBank;
|
||||||
import com.bonus.zlpt.company.service.impl.BmCoBankServiceImpl;
|
import com.bonus.zlpt.company.service.impl.BmCoBankServiceImpl;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@ public class BmCompanyInfoController extends BaseController {
|
||||||
* 企业入驻信息导出
|
* 企业入驻信息导出
|
||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
@GetMapping("/exportExcel")
|
@PostMapping("/exportExcel")
|
||||||
@ApiOperation("企业入驻信息导出")
|
@ApiOperation("企业入驻信息导出")
|
||||||
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
|
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ public class BmCompanyTypeController extends BaseController {
|
||||||
* 企业类型导出
|
* 企业类型导出
|
||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
@GetMapping("/exportExcel")
|
@PostMapping("/exportExcel")
|
||||||
@ApiOperation("企业类型导出")
|
@ApiOperation("企业类型导出")
|
||||||
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
|
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ public class BusinessOpenController extends BaseController {
|
||||||
* 企业业务开通数据导出
|
* 企业业务开通数据导出
|
||||||
* @param response
|
* @param response
|
||||||
*/
|
*/
|
||||||
@GetMapping("/exportExcel")
|
@PostMapping("/exportExcel")
|
||||||
@ApiOperation("企业业务开通数据导出")
|
@ApiOperation("企业业务开通数据导出")
|
||||||
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
|
public void exportExcel(HttpServletResponse response) throws UnsupportedEncodingException {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ public class ServiceGreementInfoController extends BaseController {
|
||||||
* @param response
|
* @param response
|
||||||
* @param
|
* @param
|
||||||
*/
|
*/
|
||||||
@GetMapping("/export")
|
@PostMapping("/export")
|
||||||
@ApiOperation("导出隐私协议模板信息")
|
@ApiOperation("导出隐私协议模板信息")
|
||||||
public void expPrivacyAgreementTemplate(HttpServletResponse response) throws UnsupportedEncodingException {
|
public void expPrivacyAgreementTemplate(HttpServletResponse response) throws UnsupportedEncodingException {
|
||||||
ExcelUtil<ServiceGreementVo> util = new ExcelUtil<>(ServiceGreementVo.class);
|
ExcelUtil<ServiceGreementVo> util = new ExcelUtil<>(ServiceGreementVo.class);
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,15 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
|
||||||
List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
|
List<BmCompanyInfo> bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto);
|
||||||
|
|
||||||
for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) {
|
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();
|
SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData();
|
||||||
bmCompanyInfo.setUserName(data.getUserName());
|
bmCompanyInfo.setUserName(data.getUserName());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,14 +15,13 @@
|
||||||
// *
|
// *
|
||||||
// * @author ruoyi
|
// * @author ruoyi
|
||||||
// */
|
// */
|
||||||
//@Service
|
////@Service
|
||||||
//public class MinioSysFileServiceImpl implements ISysFileService
|
//public class MinioSysFileServiceImpl implements ISysFileService {
|
||||||
//{
|
|
||||||
//// @Autowired
|
//// @Autowired
|
||||||
//// private MinioConfig minioConfig;
|
//// private MinioConfig minioConfig;
|
||||||
//
|
//
|
||||||
// @Autowired
|
//// @Autowired
|
||||||
// private MinioClient client;
|
//// private MinioClient client;
|
||||||
//
|
//
|
||||||
// /**
|
// /**
|
||||||
// * Minio文件上传接口
|
// * Minio文件上传接口
|
||||||
|
|
@ -31,19 +30,20 @@
|
||||||
// * @return 访问地址
|
// * @return 访问地址
|
||||||
// * @throws Exception
|
// * @throws Exception
|
||||||
// */
|
// */
|
||||||
// @Override
|
//// @Override
|
||||||
// public String uploadFile(MultipartFile file) throws Exception
|
//// public String uploadFile(MultipartFile file) throws Exception
|
||||||
// {
|
//// {
|
||||||
// String fileName = FileUploadUtils.extractFilename(file);
|
//// String fileName = FileUploadUtils.extractFilename(file);
|
||||||
// InputStream inputStream = file.getInputStream();
|
//// InputStream inputStream = file.getInputStream();
|
||||||
// PutObjectArgs args = PutObjectArgs.builder()
|
//// PutObjectArgs args = PutObjectArgs.builder()
|
||||||
// .bucket(minioConfig.getBucketName())
|
//// .bucket(minioConfig.getBucketName())
|
||||||
// .object(fileName)
|
//// .object(fileName)
|
||||||
// .stream(inputStream, file.getSize(), -1)
|
//// .stream(inputStream, file.getSize(), -1)
|
||||||
// .contentType(file.getContentType())
|
//// .contentType(file.getContentType())
|
||||||
// .build();
|
//// .build();
|
||||||
// client.putObject(args);
|
//// client.putObject(args);
|
||||||
// IoUtils.closeQuietly(inputStream);
|
//// IoUtils.closeQuietly(inputStream);
|
||||||
// return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
|
//// return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
|
||||||
// }
|
//// }
|
||||||
//}
|
////}
|
||||||
|
//}
|
||||||
Loading…
Reference in New Issue