日志修改，文件上传

mainFactory/pom.xml

@@ -40,6 +40,18 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.9</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

mainFactory/src/main/java/org/bfkj/api/CommonApi.java

@@ -4,11 +4,14 @@ import org.bfkj.application.AuthApplicationImpl;
 import org.bfkj.application.DataProcess;
 import org.bfkj.config.AppConfig;
 import org.bfkj.config.ObjectMap;
+import org.bfkj.utils.ImportExcelUtils;
 import org.bfkj.utils.MapTools;
 import org.bfkj.utils.MyDbHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -22,18 +25,20 @@ import java.util.Objects;
 public class CommonApi {
 
     @Autowired
-    AuthApplicationImpl authApplication;
+    private AuthApplicationImpl authApplication;
+    @Autowired
+    private ImportExcelUtils importExcelUtils;
 
     /**
      * 服务数据恢复 ： 因为日志的数据内容拆分为4个字段，所有此方法需要调整可
      */
     @RequestMapping("abnormalDataRecovery")
-    public Map<String,Object> abnormalDataRecovery(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
+    public Map<String, Object> abnormalDataRecovery(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
         String verificationToke = authApplication.verificationUserToken(token);
         if (!MapTools.isBlank(verificationToke)) {
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","用户令牌验证失败：" + verificationToke);
+            errMap.put("code", "-1");
+            errMap.put("message", "用户令牌验证失败：" + verificationToke);
             return errMap;
         }
         return authApplication.abnormalDataRecovery(params);
@@ -82,22 +87,22 @@ public class CommonApi {
     /**
      * 统一接收处理
      */
-    private Map<String,Object> commonInterface(Map<String, String> token, Map<String, Object> params, String defaultEvent) {
+    private Map<String, Object> commonInterface(Map<String, String> token, Map<String, Object> params, String defaultEvent) {
         if (token.containsKey("token")) {
             String appToken = token.get("token");
             String verificationToke = authApplication.verificationToken(appToken);
             if (!MapTools.isNumber(verificationToke)) {
                 HashMap<String, Object> errMap = new HashMap<>();
-                errMap.put("code","-1");
-                errMap.put("message","应用token验证失败：" + verificationToke);
+                errMap.put("code", "-1");
+                errMap.put("message", "应用token验证失败：" + verificationToke);
                 return errMap;
             }
         } else {
             String verificationToke = authApplication.verificationUserToken(token);
             if (!MapTools.isBlank(verificationToke)) {
                 HashMap<String, Object> errMap = new HashMap<>();
-                errMap.put("code","-1");
-                errMap.put("message","用户令牌验证失败：" + verificationToke);
+                errMap.put("code", "-1");
+                errMap.put("message", "用户令牌验证失败：" + verificationToke);
                 return errMap;
             }
         }
@@ -108,48 +113,69 @@ public class CommonApi {
         }
         if (!MapTools.isBlank(defaultEvent) && !event.equals(defaultEvent)) {//如果有默认事件标识且传入的事件标识与默认事件标识不相同则返回错误
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","当前接口只支持event为" + defaultEvent + "，当前接收参数为：" + params);
+            errMap.put("code", "-1");
+            errMap.put("message", "当前接口只支持event为" + defaultEvent + "，当前接收参数为：" + params);
             return errMap;
 
         }
         Object serviceId = params.get("serviceId");
         if (Objects.isNull(serviceId) || !params.containsKey("event")) {
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","缺失必要的参数：服务编号serviceId或事件标识event" + params);
+            errMap.put("code", "-1");
+            errMap.put("message", "缺失必要的参数：服务编号serviceId或事件标识event" + params);
             return errMap;
         }
         //通过服务ID 查询对应服务的服务类型是否为1，如果时则继续，否则返回
         MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.getSystemParams(AppConfig.REMOTE_DB_CONNECT));
         if (Objects.nonNull(myDbHelper.getErrorMessage())) {
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","服务：" + serviceId + " 获取数据库对象失败，异常信息 " + myDbHelper.getErrorMessage());
+            errMap.put("code", "-1");
+            errMap.put("message", "服务：" + serviceId + " 获取数据库对象失败，异常信息 " + myDbHelper.getErrorMessage());
             return errMap;
         }
         Map<String, String> hasServiceMap = myDbHelper.queryForObject("select count(1) count from serviceinfo  where serviceID=? and serviceType = 1", serviceId);
         if (hasServiceMap.get("code").equals("-1")) {
             System.out.println("数据接受获取服务信息，查询失败： " + hasServiceMap.get("message"));
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","数据接受获取服务信息，查询失败： " + hasServiceMap.get("message"));
+            errMap.put("code", "-1");
+            errMap.put("message", "数据接受获取服务信息，查询失败： " + hasServiceMap.get("message"));
             return errMap;
         }
         String count = hasServiceMap.get("returnData");
-        if ("".equals(count)|| "0".equals(count)) {
+        if ("".equals(count) || "0".equals(count)) {
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","服务：" + serviceId + "是采集服务不支持操作");
+            errMap.put("code", "-1");
+            errMap.put("message", "服务：" + serviceId + "是采集服务不支持操作");
             return errMap;
         }
         DataProcess dataProcessObj = ObjectMap.getordropInput(serviceId.toString(), true);//获取数据输出处理对象
         if (null == dataProcessObj || !MapTools.isBlank(dataProcessObj.getErrorMessage())) {
             HashMap<String, Object> errMap = new HashMap<>();
-            errMap.put("code","-1");
-            errMap.put("message","服务不可用：" + (null == dataProcessObj ? "" : dataProcessObj.getErrorMessage()));
+            errMap.put("code", "-1");
+            errMap.put("message", "服务不可用：" + (null == dataProcessObj ? "" : dataProcessObj.getErrorMessage()));
             return errMap;
         }
-        return dataProcessObj.processData(params,token.get("user_id"));
+        return dataProcessObj.processData(params, token.get("user_id"));
+    }
+
+
+    @PostMapping("/upload")
+    public Object upload(@RequestParam(value = "file") MultipartFile excelFile,@RequestParam(value = "serviceId") String serviceID, @RequestHeader Map<String, String> tokenMap) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        if (excelFile.isEmpty()) {
+            return MapTools.processFail("文件夹为空，重新上传");
+        } else {
+            String fileName = excelFile.getOriginalFilename();
+            InputStream is = excelFile.getInputStream();
+            Map<String, Object> uploadFile = importExcelUtils.upload(fileName, is);
+            if ("-1".equals(uploadFile.get("code"))) {
+                return uploadFile;
+            }
+            Map<String, Object> sendData = new HashMap<>();
+            sendData.put("serviceId", serviceID);
+            sendData.put("dataContent", uploadFile.get("returnData"));
+            commonInterface(tokenMap, sendData, "1");
+            return  MapTools.processSuccess("上传成功");
+        }
     }
 }

mainFactory/src/main/java/org/bfkj/utils/ImportExcelUtils.java

@@ -0,0 +1,116 @@
+package org.bfkj.utils;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class ImportExcelUtils {
+
+    // 将表格中的数据添加到List集合中
+    public Map<String, Object> upload(String fileName, InputStream is) {
+        try {
+            File file = new File(System.getProperty("user.dir") + File.separator + "ftp" + File.separator + System.currentTimeMillis() + "_" + fileName);
+            String isUpLoad = saveFile(file, is);
+            if (null != isUpLoad) {
+                return MapTools.processFail(isUpLoad);
+            }
+            FileInputStream fileInputStream = new FileInputStream(file);
+            Workbook workbook = getWorkbook(file.getName(), fileInputStream);
+            List<Map<String, Object>> tempMapList = new ArrayList<>();
+            int number = workbook.getNumberOfSheets(); // 获取sheet值
+            for (int i = 0; i < number; i++) {
+                Sheet sheet = workbook.getSheetAt(i); // 获取表格页码
+                if (sheet != null) {
+                    int rowNum = sheet.getLastRowNum(); // 获取该页表共有多少行
+                    Row row1 = sheet.getRow(0);
+                    int rowNum1 = row1.getLastCellNum(); // 第一行
+                    List<String> colList = new ArrayList<>();
+                    for (int k = 0; k < rowNum1; k++) {
+                        Cell cell =row1.getCell(k);
+                        if (cell != null){
+                            cell.setCellType(Cell.CELL_TYPE_STRING);
+                            colList.add(cell.getStringCellValue());
+                        }
+                    }
+                    for (int j = 1; j <= rowNum; j++) {  // 一般来说第一行是标题,所以第二行开始读取
+                        Row row = sheet.getRow(j); // 获取表格行
+                        HashMap<String, Object> tempMap = new HashMap<>();
+                        for (int col = 0; col < colList.size(); col++) {
+                            Cell cell = row.getCell(col);
+                            if (cell != null){
+                                cell.setCellType(Cell.CELL_TYPE_STRING);
+                            }
+                            tempMap.put(colList.get(col),cell ==null?null: row.getCell(col).getStringCellValue());
+                        }
+                        tempMapList.add(tempMap);
+                    }
+                }
+            }
+
+            return MapTools.processSuccess(tempMapList);
+        } catch (Exception e) {
+            return MapTools.processFail("文件上传失败： " + LogUtils.getException(e));
+        }
+    }
+    /**
+     * 文件保存到指定的位置
+     *
+     * @param is
+     * @return
+     */
+    public String saveFile(File file, InputStream is) {
+        BufferedInputStream in = null;
+        BufferedOutputStream out = null;
+        try {
+            in = new BufferedInputStream(is);
+            out = new BufferedOutputStream(new FileOutputStream(file));
+            int len = -1;
+            byte[] b = new byte[1024];
+            while ((len = in.read(b)) != -1) {
+                out.write(b, 0, len);
+            }
+            return null;
+        } catch (Exception e) {
+            return "文件保存失败";
+        } finally {
+            try {
+                if (in != null) in.close();
+            } catch (IOException e) {
+                System.out.println("文件保存 关闭IN失败 ");
+            }
+            try {
+                if (out != null) out.close();
+            } catch (IOException e) {
+                System.out.println("文件保存 关闭Out失败");
+            }
+        }
+    }
+
+    // 判断传入的文件是哪种类型的excel文件
+    public Workbook getWorkbook(String fileName, InputStream is) throws Exception {
+        Workbook workbook = null;
+        String name = fileName.substring(fileName.lastIndexOf("."));
+        System.out.println(name);
+        if (".xls".equals(name)) {
+            workbook = new HSSFWorkbook(is);
+        } else if (".xlsx".equals(name)) {
+            workbook = new XSSFWorkbook(is);
+        } else {
+            throw new Exception(" 请上传.xls/.xlsx格式文件！");
+        }
+        return workbook;
+    }
+
+
+}

mainFactory/src/main/java/org/bfkj/utils/LogUtils.java

@@ -22,7 +22,7 @@ public class LogUtils { // 依据服务编号ID获取服务类型，如果是异
     * */
     public static void logWrite(String location, String success, Object calculationLocation, String logContent, String serviceId, String workId, Object iNDataContent, String dataObjectId, Object OutDataContent, Object event) {
         String inData = MapTools.objectToString(iNDataContent);
-        String shortData = MapTools.isNotBlank(inData) ? inData.substring(0, 20480) : null;
+        String shortData = MapTools.isNotBlank(inData)?(inData.length()>20480?inData.substring(0, 20480):inData):null;
         List<Map<String, Object>> logParam = new ArrayList<>() {{
             HashMap<String, Object> hashMap = new HashMap<>();
             hashMap.put("location", location);