新增sql和更新excel导入功能

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UploadCompanyInfoAndProductController.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.hwrj.cloud.admin.dao.PmsProductExcelDao;
 import com.hwrj.cloud.admin.dto.param.ForestPath;
 import com.hwrj.cloud.admin.dto.param.PmsProductExcel;
@@ -13,7 +14,6 @@ import com.hwrj.cloud.admin.mapper.UmsCompanyFileMapper;
 import com.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper;
 import com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper;
 import com.hwrj.cloud.admin.model.*;
-import com.hwrj.cloud.admin.service.PmsProductService;
 import com.hwrj.cloud.admin.service.UmsCompanyService;
 import com.hwrj.cloud.admin.service.UmsMemberOriginService;
 import com.hwrj.cloud.admin.util.EasyExcelUtil;
@@ -61,6 +61,9 @@ public class UploadCompanyInfoAndProductController {
     @Value("${qiniu.path}")
     private String url;
 
+    List<PmsProductParam> listAll = new ArrayList<>();
+
+
     @ApiOperation("上传文件")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "paths",value = "文件路径",required = true),
@@ -132,8 +135,6 @@ public class UploadCompanyInfoAndProductController {
         }
         for (ForestPath p:list) {
             if ("产品".equals(p.getCompanyName())){
-
-
                 addProductImg(p,company,companyId);
             }else if ("供应商".equals(p.getCompanyName())){
                 addCompanyImg(p,company,companyId);
@@ -187,6 +188,7 @@ public class UploadCompanyInfoAndProductController {
             }
 
             if (i==0){
+                infoFile.setCreateTime(new Date());
                 umsCompanyFileMapper.insertSelective(infoFile);
             }
         }
@@ -308,19 +310,26 @@ public class UploadCompanyInfoAndProductController {
 
     public void addProductImg(ForestPath forestPath,String companyName,Long companyId){
         List<String> directory = getDirectory(forestPath.getPath());
-        Long aLong = companyId(companyName);
-        List<PmsProduct> products = selectProduct(companyName);
-        if (products != null&&directory != null&& products.size()>0&&directory.size()>0&&products.size()==directory.size()){
-            for (int i = 0;i<directory.size();i++){
-                updateFile(forestPath.getPath(),products.get(i).getId(),directory.get(i));
+        if (listAll != null || listAll.size()<1){
+            log.info("好像没有数据哦");
+        }
+        for (PmsProductParam  pms:listAll) {
+            if (directory.contains(pms.getProductNo())){
+                updateFile(forestPath.getPath(),pms.getId(),pms.getProductNo());
             }
         }
+//        List<PmsProduct> products = selectProduct(companyName);
+//        if (products != null&&directory != null&& products.size()>0&&directory.size()>0&&products.size()==directory.size()){
+//            for (int i = 0;i<directory.size();i++){
+//                updateFile(forestPath.getPath(),products.get(i).getId(),directory.get(i));
+//            }
+//        }
 
 
 
 
     }
-    
+
     @Test
     public void productImg(){
 //        List<String> directory = getDirectory(forestPath.getPath());
@@ -434,8 +443,7 @@ public class UploadCompanyInfoAndProductController {
     @Autowired
     private UmsMemberOriginService umsMemberOriginService;
 
-    @Autowired
-    private PmsProductService pmsProductService;
+
 
     @Transactional(rollbackFor = Exception.class)
     public String importExcel(MultipartFile file,String companyName)throws Exception{
@@ -460,7 +468,7 @@ public class UploadCompanyInfoAndProductController {
         //导入生产地
         importOriginExcel(file,companyId);
 
-        //导入铲平
+        //导入商品
         importBasic(file);
 
         return companyId;
@@ -529,7 +537,10 @@ public class UploadCompanyInfoAndProductController {
 //            }
 //        }
 
-        List<PmsProductParam> listAll = new ArrayList<>();
+//        List<PmsProductParam> listAll = new ArrayList<>();
+
+
+        listAll = new ArrayList<>();
         if(file != null){
             List<Object> list = null;
             try {
@@ -548,6 +559,8 @@ public class UploadCompanyInfoAndProductController {
         }
         log.info("sssss");
         productExcelDao.saveData(listAll);
+        log.info(JSONObject.toJSONString(listAll));
+        log.info(JSONObject.toJSONString(listAll));
 
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/PmsProductExcel.java

@@ -10,6 +10,9 @@ import java.util.Date;
 
 @Data
 public class PmsProductExcel extends BaseRowModel implements Serializable {
+
+    @ExcelProperty("产品编码")
+    private String productNo;
     /**
      * 商品名称
      */

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/PmsProductParam.java

@@ -11,6 +11,7 @@ import java.util.Date;
 public class PmsProductParam {
     @ExcelIgnore
     private Long id;
+    private String productNo;
     @ExcelIgnore
     private Long brandId;
 

forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hwrj.cloud.admin.dao.PmsProductExcelDao">
-    <insert id="saveData">
+    <insert id="saveData" useGeneratedKeys="true" keyProperty="id" parameterType="com.hwrj.cloud.admin.dto.param.PmsProductParam" >
          INSERT INTO pms_product
            (
             brand_id,
@@ -46,8 +46,8 @@
             promotion_type,
             brand_name,
             product_category_name,
-            ums_company_info_id,
-            ums_company_info,
+            comp_id,
+            comp_name,
             trade_price,
             spec,
             date_of_manufacture,
@@ -56,7 +56,7 @@
             instructions,
             points_for_attention,
             quality_guarantee_period,
-            create_user,
+            create_id,
             create_time)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">

更新sql.sql

@@ -0,0 +1,31 @@
+#删除产品数据
+DELETE FROM pms_product WHERE create_time >='2020-10-9 00:00:00';
+
+#供应商
+DELETE FROM ums_company_info WHERE create_time >='2020-10-9 00:00:00';
+#供应商文件
+DELETE FROM ums_company_file WHERE create_time >='2020-10-9 00:00:00';
+#供应商商店
+DELETE FROM ums_company_shop WHERE create_time >='2020-10-9 00:00:00';
+
+#生产地
+DELETE FROM ums_member_origin WHERE create_time >='2020-10-9 00:00:00';
+#生产地产出物
+DELETE FROM ums_member_origin_product WHERE create_time >='2020-10-9 00:00:00';
+
+# 更新商品大类
+UPDATE pms_product a
+LEFT JOIN pms_product_category b ON a.product_big_category_name = b.`name`
+SET a.product_big_category_id = b.id
+WHERE
+	b.parent_id = 0
+AND a.create_time >= '2020-10-9 00:00:00';
+
+# 更新商品小类
+UPDATE pms_product a
+LEFT JOIN pms_product_category c ON a.product_category_name = c.`name`
+SET a.product_category_id = c.id
+WHERE
+	c.parent_id != 0
+AND a.create_time >= '2020-10-9 00:00:00';
+