huminghao 2 месяцев назад
Родитель
Сommit
718c71f6fd

+ 3
- 3
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/bls/BlackCardManagerImpl.java Просмотреть файл

@@ -3,7 +3,7 @@ package cn.com.taiji.managew.manager.bls;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.pub.BeanTools;
import cn.com.taiji.core.entity.dict.basic.CardBlackType;
import cn.com.taiji.core.manager.tools.minio.MinioUtile;
import cn.com.taiji.core.manager.tools.minio.MinioUtil;
import cn.com.taiji.core.model.comm.protocol.bls.*;
import cn.com.taiji.managew.dto.bls.*;
import cn.com.taiji.managew.manager.AbstractCommManager;
@@ -31,7 +31,7 @@ import java.util.List;
public class BlackCardManagerImpl extends AbstractCommManager implements BlackCardManager{

@Autowired
private MinioUtile minioUtile;
private MinioUtil minioUtil;

@Override
public BlackCardQueryResponseDTO query(BlackCardQueryRequestDTO req) throws ManagerException {
@@ -81,7 +81,7 @@ public class BlackCardManagerImpl extends AbstractCommManager implements BlackCa

@Override
public BlackCardImportResponseDTO cardImport(BlackCardImportRequestDTO req) throws ManagerException {
File file = minioUtile.getFileByUrl(req.getExcelUrl());
File file = minioUtil.getFileByUrl(req.getExcelUrl());
List<BlackCardImportModel> modelList = EasyExcelUtil.readExcelColToModelList(file, BlackCardImportModel.class, 1);
List<BlackCardImportErrorModel> errorModelList = Lists.newArrayList();
for (BlackCardImportModel blackCardImportModel : modelList) {

+ 3
- 3
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/bls/BlackObuManagerImpl.java Просмотреть файл

@@ -3,7 +3,7 @@ package cn.com.taiji.managew.manager.bls;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.pub.BeanTools;
import cn.com.taiji.core.entity.dict.basic.ObuBlackType;
import cn.com.taiji.core.manager.tools.minio.MinioUtile;
import cn.com.taiji.core.manager.tools.minio.MinioUtil;
import cn.com.taiji.core.model.comm.protocol.bls.*;
import cn.com.taiji.managew.dto.bls.*;
import cn.com.taiji.managew.manager.AbstractCommManager;
@@ -29,7 +29,7 @@ import java.util.List;
public class BlackObuManagerImpl extends AbstractCommManager implements BlackObuManager{

@Autowired
private MinioUtile minioUtile;
private MinioUtil minioUtil;

@Override
public BlackObuQueryResponseDTO query(BlackObuQueryRequestDTO req) throws ManagerException {
@@ -79,7 +79,7 @@ public class BlackObuManagerImpl extends AbstractCommManager implements BlackObu

@Override
public BlackObuImportResponseDTO obuImport(BlackObuImportRequestDTO req) throws ManagerException {
File file = minioUtile.getFileByUrl(req.getExcelUrl());
File file = minioUtil.getFileByUrl(req.getExcelUrl());
List<BlackObuImportModel> modelList = EasyExcelUtil.readExcelColToModelList(file, BlackObuImportModel.class, 1);
List<BlackObuImportErrorModel> errorModelList = Lists.newArrayList();
for (BlackObuImportModel blackObuImportModel : modelList) {

+ 5
- 5
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/equity/CouponManagerImpl.java Просмотреть файл

@@ -3,11 +3,11 @@ package cn.com.taiji.managew.manager.equity;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.model.dao.Pagination;
import cn.com.taiji.core.entity.dict.basic.EnableFlag;
import cn.com.taiji.core.entity.dict.EnableStatus;
import cn.com.taiji.core.entity.issue.IssueCouponDetail;
import cn.com.taiji.core.entity.issue.IssueCouponInfo;
import cn.com.taiji.core.manager.cache.RedisCacheManager;
import cn.com.taiji.core.manager.tools.minio.MinioUtile;
import cn.com.taiji.core.manager.tools.minio.MinioUtil;
import cn.com.taiji.core.repo.jpa.issue.IssueCouponDetailRepo;
import cn.com.taiji.core.repo.jpa.issue.IssueCouponInfoRepo;
import cn.com.taiji.managew.dto.equity.*;
@@ -37,7 +37,7 @@ public class CouponManagerImpl extends RedisCacheManager implements CouponManage
@Autowired
private IssueCouponDetailRepo issueCouponDetailRepo;
@Autowired
private MinioUtile minioUtile;
private MinioUtil minioUtil;
@Override
public void add(CouponAddRequestDTO req) throws ServiceHandleException {
IssueCouponInfo couponInfo = copyProperties(req, new IssueCouponInfo());
@@ -77,7 +77,7 @@ public class CouponManagerImpl extends RedisCacheManager implements CouponManage

@Override
public List<IssueCouponInfo> enableList(CouponEnableListRequestDTO req) {
return issueCouponInfoRepo.findByStatus(EnableFlag.ENABLE);
return issueCouponInfoRepo.findByStatus(EnableStatus.ENABLE);
}


@@ -95,7 +95,7 @@ public class CouponManagerImpl extends RedisCacheManager implements CouponManage
IssueCouponInfo couponInfo = issueCouponInfoRepo.findById(req.getCouponId()).orElse(null);
if (couponInfo == null) throw new ManagerException("请勿传入无效的卡券类型id!");

File tempFile = minioUtile.getFileByUrl(req.getExcelFileUrl());
File tempFile = minioUtil.getFileByUrl(req.getExcelFileUrl());
//获取文件流
InputStream fileInputStream = null;
try {

+ 2
- 2
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/api/WxMpPushController.java Просмотреть файл

@@ -2,7 +2,7 @@ package cn.com.taiji.msgw.api;

import javax.validation.Valid;

import cn.com.taiji.core.manager.tools.minio.MinioUtile;
import cn.com.taiji.core.manager.tools.minio.MinioUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -31,7 +31,7 @@ public class WxMpPushController {
@Autowired
private WxManager wxManager;
@Autowired
private MinioUtile minioUtile;
private MinioUtil minioUtil;

@ApiOperation(value = "微信公众号-消息模板列表")
@PostMapping(value = "/wxMpMessageList")

Загрузка…
Отмена
Сохранить