Jelajahi Sumber

Merge remote-tracking branch 'origin/master'

yumeng 1 tahun lalu
induk
melakukan
daa7123c11

+ 5 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/HttpUtils.java

@@ -1018,9 +1018,11 @@ public class HttpUtils {
             FileBody file = new FileBody(new File(localUrl));
             MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create()
                     .addPart("file", file);
-            // 其他参数
-            for (String key : params.keySet()) {
-                entityBuilder.addTextBody(key, params.getString(key));
+            if (!Check.isNull(params)){
+                // 其他参数
+                for (String key : params.keySet()) {
+                    entityBuilder.addTextBody(key, params.getString(key));
+                }
             }
             HttpEntity entity = entityBuilder.build();
             client = HttpClientBuilder.create().build();

+ 28 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/controller/FirstDeliveryValidController.java

@@ -3,11 +3,17 @@ package cn.com.ctop.toutiao.modules.material.controller;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
 import cn.com.ctop.common.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.LoadFileUtil;
+import cn.com.ctop.shiwan.modules.FileUtil;
 import cn.com.ctop.toutiao.modules.material.service.FirstDeliveryValidService;
+import cn.com.ctop.toutiao.modules.tool.constants.AudiencePackageUrlConstant;
 import com.alibaba.fastjson.JSONObject;
+import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.DateUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +28,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 首投有效数据导入
@@ -33,12 +40,32 @@ public class FirstDeliveryValidController {
     @Resource
     private FirstDeliveryValidService firstDeliveryValidService;
 
+    @Value("${zip.local.download-path}")
+    private String downloadPath;
+
+
     /**
      * 导入EXCEL批量创建
+     * ruixuan 服务
      * 返点-首投有效素材明细
      */
     @PostMapping(value = "/importExcelMaterials")
     @ResponseBody
+    public void importExcelMaterials(HttpServletResponse response, @RequestParam("file") MultipartFile file) throws Exception {
+        StringBuffer path = new StringBuffer();
+        path.append(downloadPath).append(DateUtils.formatDate()).append("/").append(UUID.randomUUID().toString()).append("/");
+        String newFileUrl = FileUtil.approvalFile(file, path.toString());
+        HttpUtils.fileUpload("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/importExcelMaterials", newFileUrl, null);
+        Thread.sleep(30000L);
+        LoadFileUtil.delFile(newFileUrl);
+    }
+
+    /**
+     * 导入EXCEL批量创建
+     * 返点-首投有效素材明细
+     */
+   /* @PostMapping(value = "/importExcelMaterials")
+    @ResponseBody
     public Result<Object> importExcelMaterials(HttpServletResponse response, @RequestParam("file") MultipartFile file) {
         response.setHeader("Access-Control-Allow-Origin", "*");
         try {
@@ -50,7 +77,7 @@ public class FirstDeliveryValidController {
             e.printStackTrace();
             return Result.error("导入EXCEL失败," + e.getMessage());
         }
-    }
+    }*/
 
 
     /**

+ 4 - 11
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/FirstDeliveryValidServiceImpl.java

@@ -3,8 +3,6 @@ package cn.com.ctop.toutiao.modules.material.service.impl;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
 import cn.com.ctop.common.module.utils.LoadFileUtil;
-import cn.com.ctop.shiwan.modules.FileUtil;
-import cn.com.ctop.shiwan.modules.entity.ShiwanFileUpload;
 import cn.com.ctop.toutiao.modules.material.entity.FirstDeliveryValidMaterials;
 import cn.com.ctop.toutiao.modules.material.entity.FirstDeliveryValidRatio;
 import cn.com.ctop.toutiao.modules.material.mapper.FirstDeliveryValidMapper;
@@ -22,18 +20,11 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 
 @Slf4j
 @Service
@@ -41,8 +32,6 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
 
     @Autowired
     private FirstDeliveryValidMapper deliveryValidMapper;
-    @Value("${zip.local.download-path}")
-    private String downloadPath;
 
     @Override
     public Result<Object> importExcelMaterials(MultipartFile file) throws Exception {
@@ -93,6 +82,9 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
             List<JSONObject> list = this.analysisFile(file, fileName);
             for (JSONObject object : list) {
                 FirstDeliveryValidRatio material = new FirstDeliveryValidRatio(object);
+                if ("走量".equals(material.getOperationLabel())) {
+                    continue;
+                }
                 material.setDeliveryYear(year);
                 dataList.add(material);
             }
@@ -206,6 +198,7 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
         page.setTotal(total);
         return Result.OK(page);
     }
+
     public static List<JSONObject> analysisFile(MultipartFile file, String fileName) throws Exception {
         JSONObject returnJson = new JSONObject();
         Workbook workbook = null;