xwh增加在途商品明细excel导入

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsTransportInfoDetailController.java

@@ -2,6 +2,7 @@ package com.kmall.admin.controller;
 
 import java.util.*;
 
+import com.kmall.admin.dto.GoodsTransportInfoDetailExcelDto;
 import com.kmall.admin.entity.GoodsTransportInfoEntity;
 import com.kmall.common.constant.JxlsXmlTemplateName;
 import com.kmall.common.utils.PageUtils;
@@ -151,18 +152,22 @@ public class GoodsTransportInfoDetailController {
     @PostMapping("/transInfoDetailUpload")
     @ResponseBody
     public R transInfoDetailUpload(@RequestParam("file") MultipartFile file) {
-        List<GoodsTransportInfoDetailEntity> list = new ArrayList<>();
+        List<GoodsTransportInfoDetailExcelDto> goodsTransportInfoDetailExcelDtoList = new ArrayList<>();
         //上传文件
         try {
-
+            GoodsTransportInfoDetailExcelDto goodsTransportInfoDetailExcelDto = new GoodsTransportInfoDetailExcelDto();
+            Map<String, Object> beans = new HashMap<String, Object>();
+            beans.put("GoodsTransportInfoDetailExcelDto", goodsTransportInfoDetailExcelDto);
+            beans.put("GoodsTransportInfoDetailExcelDtoList", goodsTransportInfoDetailExcelDtoList);
             if (file.isEmpty()) {
                 return R.error("文件不能为空！");
             }
-
+            excelUtil.readExcel(JxlsXmlTemplateName.GOODS_TRANSPORT_INFO_DETAIL_ENTITY_LIST, beans, file.getInputStream());
         } catch (Exception e) {
             e.printStackTrace();
             return R.error("导入失败！");
         }
+        goodsTransportInfoDetailService.saveExcelDtoList(goodsTransportInfoDetailExcelDtoList);
         return R.ok("导入成功！");
     }
 }

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsTransportInfoDetailExcelDto.java

@@ -0,0 +1,117 @@
+package com.kmall.admin.dto;
+
+import java.io.Serializable;
+
+public class GoodsTransportInfoDetailExcelDto implements Serializable {
+
+    /**
+     * 是否在途（0:是，1:否，默认为0）
+     */
+    private String wayStatus;
+    /**
+     * 商品sku
+     */
+    private String sku;
+    /**
+     * 供应商id
+     */
+    private String supplierId;
+    /**
+     * 原产地
+     */
+    private String originCountry;
+    /**
+     * 数量
+     */
+    private String num;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+
+    public String getWayStatus() {
+        return wayStatus;
+    }
+
+    public void setWayStatus(String wayStatus) {
+        this.wayStatus = wayStatus;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(String supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public String getOriginCountry() {
+        return originCountry;
+    }
+
+    public void setOriginCountry(String originCountry) {
+        this.originCountry = originCountry;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getCreaterSn() {
+        return createrSn;
+    }
+
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    public String getModerSn() {
+        return moderSn;
+    }
+
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    @Override
+    public String toString() {
+        return "GoodsTransportInfoDetailExcelDto{" +
+                "wayStatus='" + wayStatus + '\'' +
+                ", sku='" + sku + '\'' +
+                ", supplierId='" + supplierId + '\'' +
+                ", originCountry='" + originCountry + '\'' +
+                ", num='" + num + '\'' +
+                ", createrSn='" + createrSn + '\'' +
+                ", moderSn='" + moderSn + '\'' +
+                '}';
+    }
+
+    public GoodsTransportInfoDetailExcelDto() {
+    }
+
+    public GoodsTransportInfoDetailExcelDto(String wayStatus, String sku, String supplierId, String originCountry, String num, String createrSn, String moderSn) {
+        this.wayStatus = wayStatus;
+        this.sku = sku;
+        this.supplierId = supplierId;
+        this.originCountry = originCountry;
+        this.num = num;
+        this.createrSn = createrSn;
+        this.moderSn = moderSn;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/GoodsTransportInfoDetailEntity.java

@@ -202,4 +202,41 @@ public class GoodsTransportInfoDetailEntity implements Serializable {
     public Date getTstm() {
         return tstm;
     }
+
+
+
+
+    @Override
+    public String toString() {
+        return "GoodsTransportInfoDetailEntity{" +
+                "transItemId=" + transItemId +
+                ", wayStatus=" + wayStatus +
+                ", sku='" + sku + '\'' +
+                ", supplierId=" + supplierId +
+                ", originCountry='" + originCountry + '\'' +
+                ", num=" + num +
+                ", createrSn='" + createrSn + '\'' +
+                ", createTime=" + createTime +
+                ", moderSn='" + moderSn + '\'' +
+                ", modTime=" + modTime +
+                ", tstm=" + tstm +
+                '}';
+    }
+
+    public GoodsTransportInfoDetailEntity() {
+    }
+
+    public GoodsTransportInfoDetailEntity(Integer transItemId, Integer wayStatus, String sku, Integer supplierId, String originCountry, Integer num, String createrSn, Date createTime, String moderSn, Date modTime, Date tstm) {
+        this.transItemId = transItemId;
+        this.wayStatus = wayStatus;
+        this.sku = sku;
+        this.supplierId = supplierId;
+        this.originCountry = originCountry;
+        this.num = num;
+        this.createrSn = createrSn;
+        this.createTime = createTime;
+        this.moderSn = moderSn;
+        this.modTime = modTime;
+        this.tstm = tstm;
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/GoodsTransportInfoDetailService.java

@@ -1,5 +1,6 @@
 package com.kmall.admin.service;
 
+import com.kmall.admin.dto.GoodsTransportInfoDetailExcelDto;
 import com.kmall.admin.entity.GoodsTransportInfoDetailEntity;
 import com.kmall.common.utils.Query;
 
@@ -75,4 +76,6 @@ public interface GoodsTransportInfoDetailService {
     List<GoodsTransportInfoDetailEntity> searchListByStatusAndSku(Query query, Integer wayStatus, String sku);
 
     int queryTotalByStatusAndSku(Query query, Integer wayStatus, String sku);
+
+    void saveExcelDtoList(List<GoodsTransportInfoDetailExcelDto> goodsTransportInfoDetailExcelDtoList);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsTransportInfoDetailServiceImpl.java

@@ -1,16 +1,18 @@
 package com.kmall.admin.service.impl;
 
+import com.kmall.admin.dao.GoodsTransportInfoDetailDao;
+import com.kmall.admin.dto.GoodsTransportInfoDetailExcelDto;
+import com.kmall.admin.entity.GoodsTransportInfoDetailEntity;
+import com.kmall.admin.service.GoodsTransportInfoDetailService;
 import com.kmall.common.utils.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.kmall.admin.dao.GoodsTransportInfoDetailDao;
-import com.kmall.admin.entity.GoodsTransportInfoDetailEntity;
-import com.kmall.admin.service.GoodsTransportInfoDetailService;
-
 /**
  * 在途商品明细表Service实现类
  *
@@ -68,4 +70,23 @@ public class GoodsTransportInfoDetailServiceImpl implements GoodsTransportInfoDe
         return goodsTransportInfoDetailDao.queryTotalByStatusAndSku(query,wayStatus,sku);
     }
 
+    @Override
+    @Transactional
+    public void saveExcelDtoList(List<GoodsTransportInfoDetailExcelDto> goodsTransportInfoDetailExcelDtoList) {
+        goodsTransportInfoDetailExcelDtoList.forEach(goodsTransportInfoDetailExcelDto -> {
+            GoodsTransportInfoDetailEntity goodsTransportInfoDetailEntity = new GoodsTransportInfoDetailEntity();
+            goodsTransportInfoDetailEntity.setWayStatus(Integer.parseInt(goodsTransportInfoDetailExcelDto.getWayStatus()));
+            goodsTransportInfoDetailEntity.setSku(goodsTransportInfoDetailExcelDto.getSku());
+            goodsTransportInfoDetailEntity.setSupplierId(Integer.parseInt(goodsTransportInfoDetailExcelDto.getSupplierId()));
+            goodsTransportInfoDetailEntity.setOriginCountry(goodsTransportInfoDetailExcelDto.getOriginCountry());
+            goodsTransportInfoDetailEntity.setNum(Integer.parseInt(goodsTransportInfoDetailExcelDto.getNum()));
+            goodsTransportInfoDetailEntity.setCreaterSn(goodsTransportInfoDetailExcelDto.getCreaterSn());
+            goodsTransportInfoDetailEntity.setModerSn(goodsTransportInfoDetailExcelDto.getModerSn());
+            goodsTransportInfoDetailEntity.setTstm(new Date());
+            goodsTransportInfoDetailEntity.setModTime(new Date());
+            goodsTransportInfoDetailEntity.setCreateTime(new Date());
+            goodsTransportInfoDetailDao.save(goodsTransportInfoDetailEntity);
+        });
+    }
+
 }

kmall-admin/src/main/resources/XmlTemplate/GoodsTransportInfoDetailEntityList.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workbook>
+    <worksheet name="Sheet1">
+        <section startRow="0" endRow="1"/>
+        <loop startRow="1" endRow="1" items="GoodsTransportInfoDetailExcelDtoList" var="GoodsTransportInfoDetailExcelDto"
+              varType="com.kmall.admin.dto.GoodsTransportInfoDetailExcelDto">
+            <section startRow="1" endRow="1">
+                <mapping row="1" col="0">GoodsTransportInfoDetailExcelDto.wayStatus</mapping>
+                <mapping row="1" col="1">GoodsTransportInfoDetailExcelDto.sku</mapping>
+                <mapping row="1" col="2">GoodsTransportInfoDetailExcelDto.supplierId</mapping>
+                <mapping row="1" col="3">GoodsTransportInfoDetailExcelDto.originCountry</mapping>
+                <mapping row="1" col="4">GoodsTransportInfoDetailExcelDto.num</mapping>
+                <mapping row="1" col="5">GoodsTransportInfoDetailExcelDto.createrSn</mapping>
+                <mapping row="1" col="6">GoodsTransportInfoDetailExcelDto.moderSn</mapping>
+            </section>
+            <loopbreakcondition>
+                <rowcheck offset="0">
+                    <cellcheck offset="0"></cellcheck>
+                </rowcheck>
+            </loopbreakcondition>
+        </loop>
+    </worksheet>
+</workbook>

kmall-common/src/main/java/com/kmall/common/constant/JxlsXmlTemplateName.java

@@ -20,4 +20,6 @@ public class JxlsXmlTemplateName {
     public static final String STORE_ID_DTO_LIST = "/XmlTemplate/StoreIdDtoList.xml";
 
     public static final String CATE_STORE_DTO_LIST = "/XmlTemplate/CateStoreDtoList.xml";
+    // 在途商品明细导入
+    public static final String GOODS_TRANSPORT_INFO_DETAIL_ENTITY_LIST = "/XmlTemplate/GoodsTransportInfoDetailEntityList.xml";
 }