Merge branch 'dev' into test

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java

api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java

@@ -47,6 +47,17 @@ public enum BasicExportTypeEnum {
      */
     ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
 
+    /**
+     * 单据信息
+     */
+//    IO_ORDER("io_order", "单据信息"),
+
+
+    /**
+     * 发票信息
+     */
+//    ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
+
     /**
      * 单据信息
      */

api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SpsSyncDataController.java

@@ -1,15 +1,14 @@
 package com.glxp.sale.admin.controller.sync;
 
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.glxp.sale.admin.constant.*;
-import com.glxp.sale.admin.dto.RelaySyncDto;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
-import com.glxp.sale.admin.entity.sync.*;
+import com.glxp.sale.admin.entity.sync.BasicExportStatusEntity;
+import com.glxp.sale.admin.entity.sync.BasicUploadStatusEntity;
 import com.glxp.sale.admin.http.SpGetHttp;
 import com.glxp.sale.admin.http.SpPostHttp;
 import com.glxp.sale.admin.idc.utils.UriUtils;
@@ -257,7 +256,7 @@ public class SpsSyncDataController {
                     throw new RuntimeException("系统异常，文件名为空");
                 }
                 relaySyncResponse = RelaySyncResponse.builder()
-                        .taskId(one.getId())
+                        .taskId(one.getTaskId())
                         .fileContent(this.readDataFile(one.getCacheFilePath()))
                         .build();
             }

api-admin/src/main/java/com/glxp/sale/admin/idc/controller/FileController.java

@@ -16,10 +16,6 @@ import com.glxp.sale.admin.idc.service.FileService;
 import com.glxp.sale.common.res.BaseResponse;
 
 
-
-
-
-
 /**
  * 中继服务接口
  */
@@ -32,30 +28,28 @@ public class FileController {
     @RequestMapping(value = "/spssync/file/upload")
     @ResponseBody
     public BaseResponse upload(HttpServletRequest request, @RequestBody Map<String, Object> params) {
-        return fileService.fileUpload(request,params);
+        return fileService.fileUpload(request, params);
     }
-   
+
     @RequestMapping(value = "/spssync/file/download")
     @ResponseBody
     public BaseResponse download(HttpServletRequest request, @RequestBody Map<String, Object> params) {
-        return fileService.fileDownload(request,params);
+        return fileService.fileDownload(request, params);
     }
-    
+
     @RequestMapping(value = "/spssync/file/downloadFile")
     @ResponseBody
     public BaseResponse downloadFile(HttpServletRequest request, @RequestBody Map<String, Object> params) {
-        return fileService.downloadFile(request,params);
+        return fileService.downloadFile(request, params);
     }
-    
+
     @RequestMapping(value = "/spssync/file/uploadFile")
     public BaseResponse uploadFile(HttpServletRequest request,
-                               @RequestParam(value = "content" , required = false) String content,
-                               @RequestParam(value = "files", required = false) MultipartFile[] files) {
+                                   @RequestParam(value = "content", required = false) String content,
+                                   @RequestParam(value = "files", required = false) MultipartFile[] files) {
         //
         return fileService.receiveFile(request, content, files);
     }
 
-    
-    
 
 }

api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java

@@ -1,37 +1,37 @@
 package com.glxp.sale.admin.idc.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
-
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.glxp.sale.admin.idc.dao.DbDao;
 import com.glxp.sale.admin.idc.service.IdcService;
 import com.glxp.sale.admin.idc.utils.UriUtils;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
+import com.glxp.sale.admin.util.MyStrUtil;
 import com.glxp.sale.common.res.BaseResponse;
-
-import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -149,6 +149,7 @@ public class IdcController {
         if (StrUtil.isNotEmpty(upperServerHost)) {
             uri = upperServerHost + "/" + uri;
         }
+        uri = changeUri(uri);
         log.info(uri);
         if (uri.contains("getImage")) {
             return redirectIamge(request, httpServletResponse, uri);
@@ -157,6 +158,67 @@ public class IdcController {
         }
     }
 
+//    @RequestMapping("/dirImages/**")
+//    public void images(HttpServletRequest request, HttpServletResponse httpServletResponse) {
+//        String uri = uriUtils.parseUri(request.getRequestURL().toString());
+//
+//        log.info(uri);
+//        String imageHost = "http://192.168.0.66:9000";
+//        String url = "";
+////        systemParamConfigService.selectValueByParamKey("is_top_service");
+//        if (StrUtil.isNotEmpty(imageHost)) {
+//            String prefix = "dirImages/";
+//            url = (imageHost.substring(imageHost.length() - 1) == "/" ? imageHost : imageHost + "/")
+//                    + uri.substring(uri.indexOf(prefix) + prefix.length());
+//
+//        }
+//        log.info(url);
+//        redirectIamge2(request, httpServletResponse, url);
+//    }
+
+    public String changeUri(String uri) {
+        String isTopService = systemParamConfigService.selectValueByParamKey("is_top_service");
+        if (StrUtil.isNotEmpty(isTopService) && isTopService.equals("1")) {
+            if (uri.contains("SP_SYNC_SERVER")) {
+                uri = uri.replace("SP_SYNC_SERVER/", "");
+            }
+        } else {
+            uri = MyStrUtil.deDup(uri);
+        }
+        log.error("changeUri = " + uri);
+        return uri;
+    }
+
+    private void redirectIamge2(HttpServletRequest request, HttpServletResponse httpServletResponse, String uri) {
+        HttpRequest result = HttpUtil.createGet(uri);
+        HttpResponse execute = result.execute();
+        execute.headers().forEach((k, v) -> {
+            httpServletResponse.setHeader(k, v.get(0));
+        });
+        ServletOutputStream outputStream = null;
+        InputStream inputStream = null;
+        try {
+            outputStream = httpServletResponse.getOutputStream();
+            inputStream = execute.bodyStream();
+            outputStream.write(inputStream.readAllBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                if (outputStream != null)
+                    outputStream.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            try {
+                if (inputStream != null)
+                    inputStream.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
 
     private byte[] redirectIamge(HttpServletRequest request, HttpServletResponse httpServletResponse, String uri) {
         RestTemplate restTemplate = new RestTemplate();

api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/FileServiceImpl.java

@@ -46,7 +46,7 @@ public class FileServiceImpl implements FileService {
     private String apiKey;
     @Value("${API_SECRET}")
     private String apiSecret;
-    
+
     @Resource
     private DbDao dbDao;
     @Resource
@@ -60,7 +60,7 @@ public class FileServiceImpl implements FileService {
             if(map!=null&&map.get("syncIp")!=null)
                 host = map.get("syncIp").toString();
         } catch (Exception ex) {
-            
+
         }
         if(StringUtils.isEmpty(host)) {
             try {
@@ -68,7 +68,7 @@ public class FileServiceImpl implements FileService {
                 if(config!=null&&config.get("paramValue")!=null)
                     host = config.get("paramValue").toString();
             } catch (Exception ex) {
-                
+
             }
         }
         if(StringUtils.isEmpty(host))
@@ -96,9 +96,9 @@ public class FileServiceImpl implements FileService {
         }
         return ResultVOUtils.error(9999,"失败");
     }
-    
-    
-    
+
+
+
     @Override
     public BaseResponse fileDownload(HttpServletRequest request,Map<String,Object> params) {
         Map<String, Object> map = dbDao.get("select * from sync_data_set limit 1");
@@ -109,7 +109,7 @@ public class FileServiceImpl implements FileService {
         }
         return ResultVOUtils.success(null);
     }
-    
+
     @Override
     public BaseResponse receiveFile(HttpServletRequest request,String content,MultipartFile[] files) {
         boolean isRelay = false;
@@ -121,9 +121,9 @@ public class FileServiceImpl implements FileService {
                 isRelay = true;
                 host = config.get("paramValue").toString();
             }
-                
+
         } catch (Exception ex) {
-            
+
         }
         ArrayList<String> saveFiles = new ArrayList<>();
         Date startTime = new Date();
@@ -157,12 +157,12 @@ public class FileServiceImpl implements FileService {
         }
         return ResultVOUtils.success(null);
     }
-    
+
     /*转发图片*/
     private String relayFile(ArrayList<String> files, String ip) {
         String host = ip;
         String result = "";
-       
+
         if (!StringUtils.isEmpty(host)) {
             host += "/spssync/file/uploadFile";
             OkHttpClient client = new OkHttpClient().newBuilder()
@@ -185,7 +185,7 @@ public class FileServiceImpl implements FileService {
                     }
                 }
             }
-          
+
             RequestBody body = builder.build();
 
             Request req = new Request.Builder()
@@ -211,8 +211,8 @@ public class FileServiceImpl implements FileService {
         }
         return result;
     }
-    
-    
+
+
     @Override
     public BaseResponse downloadFile(HttpServletRequest request,Map<String,Object> params) {
         String host = "";
@@ -221,11 +221,11 @@ public class FileServiceImpl implements FileService {
             if(config!=null&&config.get("paramValue")!=null)
                 host = config.get("paramValue").toString();
         } catch (Exception ex) {
-            
+            ex.printStackTrace();
         }
         if(!StringUtils.isEmpty(host)) {
-            String result = IDCUtils.post(host+"/spssync/file/downloadFile", params); 
- 
+            String result = IDCUtils.post(host+"/spssync/file/downloadFile", params);
+
             JSONObject object = JSON.parseObject(result);
             boolean success = false;
             if(object.getInteger("code")==20000) {
@@ -237,10 +237,10 @@ public class FileServiceImpl implements FileService {
                 }
             }
             if(!success)
-                ResultVOUtils.error(9999,"失败");   
-        
+                ResultVOUtils.error(9999,"失败");
+
         }
-        return ResultVOUtils.success(null); 
+        return ResultVOUtils.success(null);
     }
-    
-}
+
+}

api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java

@@ -226,11 +226,11 @@ public class IdcServiceImpl implements IdcService {
                 /*未发送重新发送*/
                 asyncFailTask(map.get("syncIp").toString());
             }
-           
+
             String[] syncTables = TableUtils.syncTables();
             for (int i = 0; i < syncTables.length; i++) {
                 String[] tnames = syncTables[i].split("/");
-                boolean sync = (StringUtils.isEmpty(tnames[0])&&StringUtils.isEmpty(tnames[1])) ||
+                boolean sync = (StringUtils.isEmpty(tnames[0]) && StringUtils.isEmpty(tnames[1])) ||
                         (!StringUtils.isEmpty(tnames[0]) && map != null && map.get(tnames[0]) != null && map.get(tnames[0]).toString().equals("1"));
                 saveIdcLog("---", "", map.get(tnames[0]) + syncTables[i], 0, 0);
                 if (sync) {
@@ -242,24 +242,23 @@ public class IdcServiceImpl implements IdcService {
         }
     }
 
-    
+
     /*上传失败重新上传*/
     private void asyncFailTask(String host) {
-        try 
-        {
+        try {
             String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
             String sql = "select * from basic_export_status where status='1' and receiveStatus='0' where updateTime<date_sub(now(),interval 6 minute) order by updateTime";
-            Map<String,Object> map = new HashMap<String,Object>();
+            Map<String, Object> map = new HashMap<String, Object>();
             map.put("sql", sql);
-            List<Map<String,Object>> list = dbDao.list(map);
+            List<Map<String, Object>> list = dbDao.list(map);
             ArrayList<String> files = new ArrayList<>();
-            for(int i=0;i<list.size();i++) {
+            for (int i = 0; i < list.size(); i++) {
                 String json = FileUtils.readFileAll(list.get(i).get("cacheFilePath").toString());
                 JSONObject object = JSONObject.parseObject(json);
                 List<Map> dataList = JSONObject.parseArray(JSON.toJSONString(object.get("data")), Map.class);
                 for (int m = 0; m < dataList.size(); m++) {
-                    if(object.get("filePathColumn")!=null&&!StringUtils.isEmpty(object.get("filePathColumn").toString())&&
-                            dataList.get(m).get(object.get("filePathColumn").toString()) !=null  ) {
+                    if (object.get("filePathColumn") != null && !StringUtils.isEmpty(object.get("filePathColumn").toString()) &&
+                            dataList.get(m).get(object.get("filePathColumn").toString()) != null) {
                         String fileNames = dataList.get(m).get(object.get("filePathColumn").toString()).toString();
                         String[] str = fileNames.split(",");
                         for (int r = 0; r < str.length; r++) {
@@ -267,20 +266,20 @@ public class IdcServiceImpl implements IdcService {
                                 files.add(filePath + filePathSlash + imagePath + str[r]);
                         }
                     }
-                    for(int k=0;k<30;k++) {
-                        if(dataList.get(k).get("tableName"+k) == null)
+                    for (int k = 0; k < 30; k++) {
+                        if (dataList.get(k).get("tableName" + k) == null)
                             break;
-                        if(dataList.get(k).get("data"+k)!=null && dataList.get(k).get("filePathColumn"+k)!=null) {
-                           List<Map> childList = JSONObject.parseArray(JSON.toJSONString(dataList.get(i).get("data"+k)), Map.class);
-                           for(int x =0 ;x <childList.size();x++) {
-                               if (childList.get(x).get(dataList.get(k).get("filePathColumn"+k).toString()) != null) {
-                                   String[] str = childList.get(x).get(dataList.get(k).get("filePathColumn"+k).toString()).toString().split(",");
-                                   for (int s = 0; s < str.length; s++) {
-                                       if (!StringUtils.isEmpty(str[s]) && FileUtils.isFileExist(filePath + filePathSlash + imagePath + str[s]))
-                                           files.add(filePath + filePathSlash + imagePath + str[s]);
-                                   }
-                               }
-                           }
+                        if (dataList.get(k).get("data" + k) != null && dataList.get(k).get("filePathColumn" + k) != null) {
+                            List<Map> childList = JSONObject.parseArray(JSON.toJSONString(dataList.get(i).get("data" + k)), Map.class);
+                            for (int x = 0; x < childList.size(); x++) {
+                                if (childList.get(x).get(dataList.get(k).get("filePathColumn" + k).toString()) != null) {
+                                    String[] str = childList.get(x).get(dataList.get(k).get("filePathColumn" + k).toString()).toString().split(",");
+                                    for (int s = 0; s < str.length; s++) {
+                                        if (!StringUtils.isEmpty(str[s]) && FileUtils.isFileExist(filePath + filePathSlash + imagePath + str[s]))
+                                            files.add(filePath + filePathSlash + imagePath + str[s]);
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -293,7 +292,7 @@ public class IdcServiceImpl implements IdcService {
                 if (IDCUtils.isJson(result)) {
                     JSONObject res = JSON.parseObject(result);
                     if (res.getInteger("code") == 20000) {
-                        executeSql("update basic_export_status set receiveStatus='1',endTime=now() where id='"+list.get(i).get("id")+"'");
+                        executeSql("update basic_export_status set receiveStatus='1',endTime=now() where id='" + list.get(i).get("id") + "'");
                         saveIdcLog(object.getString("messageType"), list.get(i).get("id").toString(), object.getString("tableName") + ">reUpload->success", 0, 0);
                     } else {
                         saveIdcLog(object.getString("messageType"), list.get(i).get("id").toString(), object.getString("tableName") + ">reUpload->fail", 0, 0);
@@ -303,78 +302,78 @@ public class IdcServiceImpl implements IdcService {
                 }
             }
         } catch (Exception ex) {
-            
+
         }
     }
-   
+
     /*数据删除同步*/
-    private void asyncDelete(String tname,boolean isUpload,String syncIp) {
+    private void asyncDelete(String tname, boolean isUpload, String syncIp) {
         String[] tnames = tname.split("/");
-        String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0]+"."+tnames[1]+".delete");
+        String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1] + ".delete");
         Date nowUpdateTime = new Date();
-        String where = "tableName='"+tnames[2].toLowerCase()+"' and updateTime between cast('"+lastUpdateTime+"' as datetime) "+
-                " and cast('"+DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss")+"' as datetime)";
-        Map<String,Object> count = new HashMap<String,Object>();
-        count.put("sql", "select count(*) from idc_delete where "+where);
+        String where = "tableName='" + tnames[2].toLowerCase() + "' and updateTime between cast('" + lastUpdateTime + "' as datetime) " +
+                " and cast('" + DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)";
+        Map<String, Object> count = new HashMap<String, Object>();
+        count.put("sql", "select count(*) from idc_delete where " + where);
         int total = dbDao.count(count);
         int limit = 50;
         if (total > 0) {
             boolean success = true;
             for (int i = 0; i < Math.ceil(total / limit) + 1; i++) {
                 Date startTime = new Date();
-                Map<String,Object> map = new HashMap<String,Object>();
+                Map<String, Object> map = new HashMap<String, Object>();
                 map.put("sql", "select * from idc_delete");
                 map.put("sqlWhere", where);
                 map.put("limit", limit);
                 map.put("page", i * limit);
-                List<Map<String,Object>> list = dbDao.list(map);
-                if(list!=null&&map.size()>0) {
-                   List<Map<String,Object>> data = new ArrayList<>();
-                   for(int k=0;i<list.size();k++) {
-                       String line = list.get(k).get("uniqueValue").toString();
-                       JSONObject obj = JSON.parseObject(line);
-                       String uniqueColumn = "";
-                       for(String key : obj.keySet()){
-                           uniqueColumn += uniqueColumn.length()>0 ? ","+key : key;
-                       }
-                       obj.put("uniqueColumn", uniqueColumn);
-                       obj.put("operateMode", "D");
-                       data.add(obj);
-                   }
-                   Map<String,Object> msg = new HashMap<String, Object>();
-                   msg.put("messageId", CustomUtil.getId());
-                   msg.put("messageType", tnames[9]+"(删除)");
-                   msg.put("apiCode", "common");
-                   msg.put("tableName", DBAUtils.tableAliasName(tnames[2]));
-                   msg.put("sendTime", new Date());
-                   msg.put("version", "1.0");
-                   msg.put("total", data.size());
-                   msg.put("data", data);
-                   if (isUpload) {
-                       String result = "";
-                       try {
-                           result = relay("", JSON.toJSONString(msg), null, syncIp);
-                       } catch (Exception ex) {
-        
-                       }
-                       if (IDCUtils.isJson(result)) {
-                           JSONObject json = JSON.parseObject(result);
-                           if (json.getInteger("code") == 20000) {
-                               saveIdcLog(tnames[9], "", tnames[2] + ">success(delete)", i * limit, total);
-                           } else {
-                               success = false;
-        
-                               saveIdcLog(tnames[9], "", tnames[2] + ">" + result, i * limit, total);
-                           }
-                       } else {
-                           success = false;
-                           saveIdcLog(tnames[9], "", syncIp + ":" + tnames[2] + ">fail:上传地址未连通", i * limit, total);
-                       }
-        
-                   } else {
-                       saveIdcLog(tnames[9], "", tnames[2] + ">success(delete)", i * limit, total);
-                   }
-                   syncAddTaskStatus(msg, isUpload ? 1 : 0, true, startTime, isUpload,success);
+                List<Map<String, Object>> list = dbDao.list(map);
+                if (list != null && map.size() > 0) {
+                    List<Map<String, Object>> data = new ArrayList<>();
+                    for (int k = 0; i < list.size(); k++) {
+                        String line = list.get(k).get("uniqueValue").toString();
+                        JSONObject obj = JSON.parseObject(line);
+                        String uniqueColumn = "";
+                        for (String key : obj.keySet()) {
+                            uniqueColumn += uniqueColumn.length() > 0 ? "," + key : key;
+                        }
+                        obj.put("uniqueColumn", uniqueColumn);
+                        obj.put("operateMode", "D");
+                        data.add(obj);
+                    }
+                    Map<String, Object> msg = new HashMap<String, Object>();
+                    msg.put("messageId", CustomUtil.getId());
+                    msg.put("messageType", tnames[9] + "(删除)");
+                    msg.put("apiCode", "common");
+                    msg.put("tableName", DBAUtils.tableAliasName(tnames[2]));
+                    msg.put("sendTime", new Date());
+                    msg.put("version", "1.0");
+                    msg.put("total", data.size());
+                    msg.put("data", data);
+                    if (isUpload) {
+                        String result = "";
+                        try {
+                            result = relay("", JSON.toJSONString(msg), null, syncIp);
+                        } catch (Exception ex) {
+
+                        }
+                        if (IDCUtils.isJson(result)) {
+                            JSONObject json = JSON.parseObject(result);
+                            if (json.getInteger("code") == 20000) {
+                                saveIdcLog(tnames[9], "", tnames[2] + ">success(delete)", i * limit, total);
+                            } else {
+                                success = false;
+
+                                saveIdcLog(tnames[9], "", tnames[2] + ">" + result, i * limit, total);
+                            }
+                        } else {
+                            success = false;
+                            saveIdcLog(tnames[9], "", syncIp + ":" + tnames[2] + ">fail:上传地址未连通", i * limit, total);
+                        }
+
+                    } else {
+                        saveIdcLog(tnames[9], "", tnames[2] + ">success(delete)", i * limit, total);
+                    }
+                    syncAddTaskStatus(msg, isUpload ? 1 : 0, true, startTime, isUpload, success);
                 }
             }
         }
@@ -493,11 +492,11 @@ public class IdcServiceImpl implements IdcService {
                 } else {
                     success = false;
                 }
-                syncAddTaskStatus(json.getJSONObject("data"), 3, true, startTime, true,success);
+                syncAddTaskStatus(json.getJSONObject("data"), 3, true, startTime, true, success);
             } else {
                 if (json.get("code") != null && json.get("data") != null) {
                     //logger.info("res1-->"+JSON.toJSONString(json));
-                    syncAddTaskStatus(json.getJSONObject("data"), 0, true, startTime, true,success);
+                    syncAddTaskStatus(json.getJSONObject("data"), 0, true, startTime, true, success);
                     analyMiddle(host, json.getJSONObject("data"), files, false, false);
                 }
             }
@@ -585,7 +584,7 @@ public class IdcServiceImpl implements IdcService {
         boolean success = false;
         if (isLastLevel()) {
             success = analyMiddle("", json, files, true, true);
-            syncAddTaskStatus(json, 3, true, startTime, true,success);
+            syncAddTaskStatus(json, 3, true, startTime, true, success);
             if (!success) {
 
                 return ResultVOUtils.error(9000, "解析失败");
@@ -596,11 +595,11 @@ public class IdcServiceImpl implements IdcService {
                 String host = getNextHost();
                 String result = relay(request.getHeader("reqNo"), content, saveFiles, host);
                 if (IDCUtils.isJson(result)) {
-                    syncAddTaskStatus(json, 2, true, startTime, true,true);
+                    syncAddTaskStatus(json, 2, true, startTime, true, true);
                     BaseResponse object = JSON.parseObject(result, BaseResponse.class);
                     return object;
                 } else {
-                    syncAddTaskStatus(json, 2, true, startTime, false,false);
+                    syncAddTaskStatus(json, 2, true, startTime, false, false);
                     return ResultVOUtils.error(9000, "转发失败");
                 }
 
@@ -631,6 +630,7 @@ public class IdcServiceImpl implements IdcService {
         OutputStream os;
         String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : fileName.substring(0, 1).equals("/") ? "" : "/";
         String sourceFileName = filePath + filePathSlash + imagePath + fileName;
+//        String sourceFileName = fileName;
         try {
             if (FileUtils.isFileExist(sourceFileName)) {
                 byte[] bytes = FileUtils.readFileByBytes(sourceFileName);
@@ -827,7 +827,7 @@ public class IdcServiceImpl implements IdcService {
                             }
                             saveIdcLog(messageType, "", tableName + ">success", i * limit, total);
                         }
-                        syncAddTaskStatus(data, isUpload ? 1 : 0, true, startTime, isUpload,success);
+                        syncAddTaskStatus(data, isUpload ? 1 : 0, true, startTime, isUpload, success);
                     }
                 }
             }
@@ -839,7 +839,7 @@ public class IdcServiceImpl implements IdcService {
 
     /*增加同步任务状态*/
     private void syncAddTaskStatus(Map<String, Object> json, int scheduleType, boolean success, Date startTime,
-                                   boolean isEnd,boolean isReceive) {
+                                   boolean isEnd, boolean isReceive) {
         try {
             String content = JSON.toJSONString(json);
             String datePath = DateUtil.formatDate(new Date(), "yyyy-MM-dd");
@@ -866,7 +866,7 @@ public class IdcServiceImpl implements IdcService {
             map.put("status", success ? "1" : "0");
             map.put("receiveStatus", isReceive ? "1" : "0");
             map.put("startTime", startTime != null ? startTime : new Date());
-            if(isReceive)
+            if (isReceive)
                 map.put("endTime", new Date());
             map.put("updateTime", new Date());
             map.put("remark", json.get("messageType") + ": " + json.get("total") + "条");
@@ -960,7 +960,7 @@ public class IdcServiceImpl implements IdcService {
         String[] keyColumn = new String[30];
         String[] keyDataType = new String[30];
         List<Map<String, String>> columnList = dbDao.listColumnsMysql(tName);
-        Map<String,Object> column = getColumn(tName);
+        Map<String, Object> column = getColumn(tName);
         boolean result = false;
         int key = 0;
         int col = 0;
@@ -998,13 +998,13 @@ public class IdcServiceImpl implements IdcService {
                 }
 
                 if ("A,D,U".contains(operateMode)) {
-                    if(operateMode.equals("D")&&list.get(i).get("uniqueColumn")!=null) {
+                    if (operateMode.equals("D") && list.get(i).get("uniqueColumn") != null) {
                         String[] ucs = list.get(i).get("uniqueColumn").toString().split(",");
-                        for(String str:ucs) {
-                            Map<String,Object> map = (Map<String, Object>) column.get(str);
+                        for (String str : ucs) {
+                            Map<String, Object> map = (Map<String, Object>) column.get(str);
                             String dataType = map.get("dataType").toString();
                             updateWhere += !StringUtils.isEmpty(updateWhere) ? " and " : " ";
-                            updateWhere += str +" = "+(dataType.equals("C") ? "'" : "") + list.get(i).get(str) + (dataType.equals("C") ? "'" : "");
+                            updateWhere += str + " = " + (dataType.equals("C") ? "'" : "") + list.get(i).get(str) + (dataType.equals("C") ? "'" : "");
                         }
                     } else {
                         for (int z = 0; z < keyColumn.length; z++) {
@@ -1180,15 +1180,14 @@ public class IdcServiceImpl implements IdcService {
                 .post(body)
                 .addHeader("Content-Type", "application/x-www-form-urlencoded")
                 .build();
-        int total=0;
+        int total = 0;
         try {
             Response result = client.newCall(request).execute();
             String msg = result != null ? result.message().length() > 200 ? result.message().substring(0, 200) : result.message() : "";
-           
+
             if (result != null && result.isSuccessful() && MediaType.parse("application/force-download").equals(result.body().contentType())) {
                 try (InputStream inputStream = result.body().byteStream()) {
 
-
                     FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath + fileName);
 
                     byte b[] = new byte[1024];
@@ -1208,8 +1207,8 @@ public class IdcServiceImpl implements IdcService {
                     }
 
                 } catch (Exception e) {
-
-
+                    e.printStackTrace();
+                    log.error("", e);
                 }
             }
             if (!(total > 0)) {
@@ -1222,9 +1221,71 @@ public class IdcServiceImpl implements IdcService {
             e.printStackTrace();
         }
 
-        return (total>0);
+        return (total > 0);
     }
 
+//    @Override
+//    public boolean signleDownloadFile(String syncIp, String fileFullName) {
+//        OkHttpClient client = new OkHttpClient().newBuilder()
+//                .build();
+//        ;
+//        MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
+//
+//        RequestBody body = RequestBody.create(mediaType, "fileName=" + fileFullName);
+//
+//        Request request = new Request.Builder()
+//                .url(syncIp + "/spssync/common/downloadFile")
+//                .post(body)
+//                .addHeader("Content-Type", "application/x-www-form-urlencoded")
+//                .build();
+//        int total = 0;
+//        try {
+//            Response result = client.newCall(request).execute();
+//            String msg = result!=null ? result.message().length()>200 ? result.message().substring(0,200) : result.message() : "";
+//
+//            if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
+//                try (InputStream inputStream = result.body().byteStream()) {
+//
+//                    String path = fileFullName.substring(0,fileFullName.lastIndexOf("/"));
+//                    if(!FileUtils.makeDirectory(path))
+//                        IDCUtils.createDirectory(path);
+//
+//
+//                    FileOutputStream outputStream = new FileOutputStream(fileFullName);
+//
+//                    byte b[] = new byte[1024];
+//
+//                    int len = 0;
+//                    while ((len = inputStream.read(b)) != -1) {
+//                        total += len;
+//                        outputStream.write(b, 0, len);
+//
+//                    }
+//
+//                    outputStream.flush();
+//                    outputStream.close();
+//                    if(!(total>0)) {
+//                        new File(fileFullName).delete();
+//                        executeSql("delete from idc_file where filePath='"+fileFullName+"'");
+//                    }
+//
+//                } catch (Exception e) {
+//
+//
+//                }
+//            }
+//            if(!(total>0)) {
+//                String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileFullName+"',now(),'"+msg+"')";
+//                executeSql(sql);
+//            }
+//
+//        } catch (IOException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        return (total>0);
+//    }
+
     /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/
     private String getNextHost() {
         SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("upper_server_ip");

api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java

@@ -194,7 +194,7 @@ public class DlAllDataService {
 
                             String taskId = syncOrderResponse.getString("taskId");
                             myEntity.setId(taskId);
-                            JSONArray fileJson = syncOrderResponse.getJSONArray("files");
+                            JSONArray fileJson = syncOrderResponse.getJSONArray("syncFiles");
                             if (fileJson != null) {
                                 List<String> syncFiles = fileJson.toJavaList(String.class);
                                 if (CollUtil.isNotEmpty(syncFiles)) {
@@ -263,6 +263,10 @@ public class DlAllDataService {
         switch (exportType){
             case IO_ORDER:
             case COUNTRY_DI_DATA:
+            case SYS_SET_DATA:
+            case DOCUMENT_TYPE_DATA:
+            case USER_DATA:
+            case THIRD_DATA:
                 return;
         }
 

api-admin/src/main/resources/application-pro.properties

@@ -16,8 +16,8 @@ cors.allowed-Credentials=true
 server.tomcat.max-http-form-post-size=100MB
 server.max-http-header-size=100MB
 #\u6700\u5927\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F(10MB)
-spring.servlet.multipart.max-file-size=104857600
-spring.servlet.multipart.max-request-size=104857600
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
 server.connectionTimeout=180000
 #logging.level.com.glxp.sale.admin.dao=debug
 # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002

api-admin/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=test
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml

api-common/src/main/java/com/glxp/sale/common/enums/ResultEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 @Getter
 public enum ResultEnum {
 
-    SUCCESS(0, "success"),
+    SUCCESS(20000, "success"),
     NOT_NETWORK(1, "系统繁忙，请稍后再试。"),
     LOGIN_VERIFY_FALL(2, "登录失效"),
     PARAM_VERIFY_FALL(3, "参数验证错误"),

api-common/src/main/java/com/glxp/sale/common/util/ResultVOUtils.java

@@ -18,7 +18,7 @@ public class ResultVOUtils {
      */
     public static BaseResponse success(Object data) {
         BaseResponse<Object> baseResponse = new BaseResponse<>();
-        baseResponse.setCode(20000);
+        baseResponse.setCode(ResultEnum.SUCCESS.getCode());
         baseResponse.setMessage("success");
         baseResponse.setData(data);
         return baseResponse;