仓库文件上传调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/BucketFileBus.java

@@ -19,6 +19,7 @@ import java.util.List;
 public enum BucketFileBus {
 
     SERVICEHALL("网点","servicehall"),
+    INVW("库存系统","invw"),
 
 
     ;

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/minio/MinioUtile.java

@@ -86,7 +86,7 @@ public class MinioUtile extends CommonAbstract {
      * @throws ManagerException
      */
     public String fileUploadHttp(File file, BucketFileBus busCode) throws ManagerException {
-        return fileUploadHttp(file, null, busCode);
+        return fileUploadHttp(file, "", busCode);
     }
 
     /**
@@ -113,7 +113,7 @@ public class MinioUtile extends CommonAbstract {
                     .build());
 
         } catch (Exception e) {
-            logger.error("MinIo 上传文件失败...{}", e.getMessage());
+            logger.error("MinIo 上传文件失败...{}", e);
             throw new ManagerException("MinIo 上传文件失败...请联系管理员");
         }
         file.delete();

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/stocktaking/InvwStocktakingInfoController.java

@@ -32,7 +32,7 @@ public class InvwStocktakingInfoController extends MyValidController {
 
     @ApiOperation(value = "02-设备移除明细")
     @PostMapping("/remove")
-    public ApiResponse<InvwStocktakingInfoRemoveResponseDTO> remove(@Valid @RequestBody InvwStocktakingInfoRemoveRequestDTO req) throws Exception {
+    public ApiResponse<InvwStocktakingInfoRemoveResponseDTO> remove(@Valid @RequestBody InvwStocktakingInfoRemoveRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.remove(req));
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/warehouse/InvwWarehouseController.java

@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
 
 @Api(tags = {"005-仓库管理"})
 @RestController

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java

@@ -3,6 +3,7 @@ package cn.com.taiji.invw.manager.card;
 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.BucketFileBus;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
 import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwCardDetails;
@@ -121,7 +122,7 @@ public class InvwCardDetailsManagerImpl extends AbstractInvwManager implements I
         Map<String, String> storeMap = storeList.stream().collect(Collectors.toMap(InvwWarehouse::getCode, InvwWarehouse::getName));
         List<InvwCardDetailsExcelModel> excelModelList2 = excelModelList.stream().peek(t -> t.setStoreName(storeMap.get(t.getStoreCode()))).collect(Collectors.toList());
         File file = EasyExcelUtil.exportExcelFile(InvwCardDetailsExcelModel.class, excelModelList2, "卡设备");
-        String filePath = minioUtile.fileUploadHttp(file);
+        String filePath = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO responseDTO = new CommExcelFileResponseDTO();
         return responseDTO.setFilePath(filePath);
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwQryCardBatchManagerImpl.java

@@ -2,6 +2,7 @@ package cn.com.taiji.invw.manager.card;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryCardBatch;
 import cn.com.taiji.core.manager.tools.minio.MinioUtile;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardBatchRepo;
@@ -61,7 +62,7 @@ public class InvwQryCardBatchManagerImpl extends AbstractCommManager implements
         // 写入数据
         EasyExcel.write(file, InvwQryCardBatchExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file);
+        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwQryCardsManagerImpl.java

@@ -2,6 +2,7 @@ package cn.com.taiji.invw.manager.card;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryCards;
 import cn.com.taiji.core.manager.tools.minio.MinioUtile;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardsRepo;
@@ -61,7 +62,7 @@ public class InvwQryCardsManagerImpl extends AbstractCommManager implements Invw
         // 写入数据
         EasyExcel.write(file, InvwQryCardsExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file);
+        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManagerImpl.java

@@ -3,6 +3,7 @@ package cn.com.taiji.invw.manager.obu;
 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.BucketFileBus;
 import cn.com.taiji.core.entity.dict.basic.ObuType;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
 import cn.com.taiji.core.entity.dict.log.OperateType;
@@ -136,7 +137,7 @@ public class InvwObuDetailsManagerImpl extends AbstractInvwManager implements In
         Map<String, String> storeMap = storeList.stream().collect(Collectors.toMap(InvwWarehouse::getCode, InvwWarehouse::getName));
         List<InvwObuDetailsExcelModel> excelModelList2 = excelModelList.stream().peek(t -> t.setStoreName(storeMap.get(t.getStoreCode()))).collect(Collectors.toList());
         File file = EasyExcelUtil.exportExcelFile(InvwObuDetailsExcelModel.class, excelModelList2, "签设备");
-        String filePath = minioUtile.fileUploadHttp(file);
+        String filePath = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO responseDTO = new CommExcelFileResponseDTO();
         return responseDTO.setFilePath(filePath);
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwQryObuBatchManagerImpl.java

@@ -2,6 +2,7 @@ package cn.com.taiji.invw.manager.obu;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryObuBatch;
 import cn.com.taiji.core.manager.tools.minio.MinioUtile;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObuBatchRepo;
@@ -61,7 +62,7 @@ public class InvwQryObuBatchManagerImpl extends AbstractCommManager implements I
         // 写入数据
         EasyExcel.write(file, InvwQryObuBatchExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file);
+        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwQryObusManagerImpl.java

@@ -2,6 +2,7 @@ package cn.com.taiji.invw.manager.obu;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryObus;
 import cn.com.taiji.core.manager.tools.minio.MinioUtile;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObusRepo;
@@ -61,7 +62,7 @@ public class InvwQryObusManagerImpl extends AbstractCommManager implements InvwQ
         // 写入数据
         EasyExcel.write(file, InvwQryObusExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file);
+        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/stocktaking/InvwStocktakingInfoManager.java

@@ -7,7 +7,7 @@ import cn.com.taiji.invw.dto.stocktaking.*;
 public interface InvwStocktakingInfoManager {
     Pagination page(InvwStocktakingInfoPageRequestDTO req);
 
-    InvwStocktakingInfoRemoveResponseDTO remove(InvwStocktakingInfoRemoveRequestDTO req) throws Exception;
+    InvwStocktakingInfoRemoveResponseDTO remove(InvwStocktakingInfoRemoveRequestDTO req) throws ManagerException;
 
     void stock(InvwStocktakingInfoStockRequestDTO req) throws ManagerException;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/stocktaking/InvwStocktakingInfoManagerImpl.java

@@ -3,6 +3,7 @@ package cn.com.taiji.invw.manager.stocktaking;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.model.dao.ResultConverter;
+import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
 import cn.com.taiji.core.entity.dict.invw.InventoryType;
@@ -73,7 +74,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
     }
 
     @Override
-    public InvwStocktakingInfoRemoveResponseDTO remove(InvwStocktakingInfoRemoveRequestDTO req) throws Exception {
+    public InvwStocktakingInfoRemoveResponseDTO remove(InvwStocktakingInfoRemoveRequestDTO req) throws ManagerException {
         // 初始化响应对象
         InvwStocktakingInfoRemoveResponseDTO response = new InvwStocktakingInfoRemoveResponseDTO();
         File file = null;
@@ -218,7 +219,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
         try {
             File tempFile = File.createTempFile("temp_error_设备移除错误反馈表", ".xlsx");
             EasyExcel.write(tempFile, InvwStocktakingInfoRemoveModel.class).sheet("设备移除错误反馈表").doWrite(result);
-            return minioUtile.fileUploadHttp(tempFile);
+            return minioUtile.fileUploadHttp(tempFile, BucketFileBus.INVW);
         } catch (Exception e) {
             throw e;
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/transfer/InvwTransferApplyManagerImpl.java

@@ -14,7 +14,6 @@ import cn.com.taiji.core.manager.tools.minio.MinioUtile;
 import cn.com.taiji.core.repo.jpa.invw.*;
 import cn.com.taiji.core.repo.request.invw.InvwTransferApplyPageRequest;
 import cn.com.taiji.invw.dto.transfer.*;
-import cn.com.taiji.invw.manager.AbstractCommManager;
 import cn.com.taiji.invw.manager.AbstractInvwManager;
 import cn.com.taiji.invw.model.transfer.InvwTransferApplyCommModel;
 import cn.com.taiji.invw.model.transfer.InvwTransferApplyDetailsModel;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManager.java

@@ -4,8 +4,6 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.invw.dto.warehouse.*;
 
-import java.util.List;
-
 public interface InvwWarehouseManager {
     Pagination page(InvwWarehousePageRequestDTO request);
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/card/InvwQryCardBatchExcelModel.java

@@ -19,55 +19,55 @@ import java.time.LocalDateTime;
 @Setter
 public class InvwQryCardBatchExcelModel implements Serializable {
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "结果集", index = 0)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "结果集")
     private String datas;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "批次号", index = 1)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "批次号")
     private String batchNo;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "批次申请日期", index = 3)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "批次申请日期")
     private String batchDate;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "卡片类型", index = 4)
+    @ExcelProperty(value = "卡片类型")
     private String cardType;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "卡片起始号", index = 5)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "卡片起始号")
     private String startNum;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "卡片结束号", index = 6)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "卡片结束号")
     private String endNum;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "批次总张数", index = 7)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "批次总张数")
     private String totalCount;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "申请状态", index = 8)
+    @ExcelProperty(value = "申请状态")
     private String status;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "卡片版本号", index = 9)
+    @ExcelProperty(value = "卡片版本号")
     private Integer cardVersion;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "设备类型", index = 10)
+    @ExcelProperty(value = "设备类型")
     private String seType;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "发行方代码", index = 11)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "发行方代码")
     private String orgId;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "渠道", index = 12)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "渠道")
     private String chanel;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "入库时间", index = 13)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "入库时间")
     private LocalDateTime insertTime;
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/card/InvwQryCardsExcelModel.java

@@ -18,59 +18,59 @@ import java.time.LocalDateTime;
 @Setter
 public class InvwQryCardsExcelModel {
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "结果集", index = 0)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "结果集")
     private String datas;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "批次号", index = 1)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "批次号")
     private String batchNo;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "卡号", index = 3)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "卡号")
     private String cardNo;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "卡片厂商", index = 4)
+    @ExcelProperty(value = "卡片厂商")
     private String provider;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "卡片类型", index = 5)
+    @ExcelProperty(value = "卡片类型")
     private String cardType;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "发行状态", index = 6)
+    @ExcelProperty(value = "发行状态")
     private Integer status;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "一发日期", index = 7)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "一发日期")
     private String formatTime;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "二发/客服日期", index = 8)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "二发/客服日期")
     private String lastUpdateTime;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "卡片SNR", index = 9)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "卡片SNR")
     private String cardSnr;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "发行次数", index = 10)
+    @ExcelProperty(value = "发行次数")
     private Integer issueCount;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "渠道", index = 11)
+    @ExcelProperty(value = "渠道")
     private String chanel;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "渠道ID", index = 12)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "渠道ID")
     private String chanelId;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "卡片厂商代码", index = 13)
+    @ExcelProperty(value = "卡片厂商代码")
     private String providerID;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "入库时间", index = 14)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "入库时间")
     private LocalDateTime insertTime;
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/obu/InvwQryObuBatchExcelModel.java

@@ -18,47 +18,47 @@ import java.time.LocalDateTime;
 @Setter
 public class InvwQryObuBatchExcelModel {
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "单号数据的结果集", index = 0)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "单号数据的结果集")
     private String datas;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "批次号", index = 1)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "批次号")
     private String batchNo;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "批次申请日期", index = 3)
+    @ColumnWidth(15)
+    @ExcelProperty(value = "批次申请日期")
     private String applyDate;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "OBU类型", index = 4)
+    @ExcelProperty(value = "OBU类型")
     private String obuType;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "OBU起始号", index = 5)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "OBU起始号")
     private String startNum;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "OBU结束号", index = 6)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "OBU结束号")
     private String endNum;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "卡片起始号", index = 7)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "卡片起始号")
     private String startCardNum;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "卡片结束号", index = 8)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "卡片结束号")
     private String endCardNum;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "批次总张数", index = 9)
+    @ExcelProperty(value = "批次总张数")
     private String totalCount;
 
     @ColumnWidth(10)
-    @ExcelProperty(value = "渠道名称", index = 10)
+    @ExcelProperty(value = "渠道名称")
     private String chanel;
 
-    @ColumnWidth(10)
-    @ExcelProperty(value = "入库时间", index = 11)
+    @ColumnWidth(20)
+    @ExcelProperty(value = "入库时间")
     private LocalDateTime insertTime;
 }