提交保存一版

src/main/java/info/aspirecn/iov/sjjh/supplier10000040/constant/ChannelConstant.java

@@ -7,19 +7,19 @@ package info.aspirecn.iov.sjjh.supplier10000040.constant;
  * @version: V1.0
  **/
 public class ChannelConstant {
-    public static String ILLEGAL_INFO_SCORE = "score";
-    public static String ILLEGAL_INFO_RESULT = "result";
-    public static String ILLEGAL_INFO_SIMPLE = "simple";
-    public static String ILLEGAL_INFO_DRUG_ESCAPE = "drugAndEscape";
+    public static final String ILLEGAL_INFO_SCORE = "score";
+    public static final String ILLEGAL_INFO_RESULT = "result";
+    public static final String ILLEGAL_INFO_SIMPLE = "simple";
+    public static final String ILLEGAL_INFO_DRUG_ESCAPE = "drugAndEscape";
 
     // 状态 1：待处理
-    public static Integer REQUEST_STATUS_1 = 1;
+    public static final Integer REQUEST_STATUS_1 = 1;
     // 2：处理中
-    public static Integer REQUEST_STATUS_2 = 2;
+    public static final Integer REQUEST_STATUS_2 = 2;
     // 3：已发送上游
-    public static Integer REQUEST_STATUS_3 = 3;
+    public static final Integer REQUEST_STATUS_3 = 3;
     // 4：处理完成
-    public static Integer REQUEST_STATUS_4 = 4;
+    public static final Integer REQUEST_STATUS_4 = 4;
 
     public static final String DECODE_TYPE_SHA256 = "SHA256";
 

src/main/java/info/aspirecn/iov/sjjh/supplier10000040/process/IllegalInfoProcessor.java

@@ -38,7 +38,7 @@ import java.util.Map;
  * @version: V1.0
  **/
 @Slf4j
-//@Component
+@Component
 public class IllegalInfoProcessor implements Processor {
     @Value("${localDir.download}")
     private String localDownloadDir;
@@ -178,7 +178,7 @@ public class IllegalInfoProcessor implements Processor {
                 request.setResultCode(responseObject.getResultCode());
 
                 if (asyncReqInfo.getIfJkCode() == 1) {
-                    String code = supplierProperties.getCode().get(String.valueOf(responseObject.getResultCode()));
+                    String code = supplierProperties.getCode().get(responseObject.getResultCode());
                     if (code != null) {
                         request.setResultCode(Integer.valueOf(code));
                     }

src/main/java/info/aspirecn/iov/sjjh/supplier10000040/sftp/IllegalInfoDownloadRoute.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
  * @version: V1.0
  **/
 @Slf4j
-//@Component
+@Component
 public class IllegalInfoDownloadRoute extends RouteBuilder {
     @Value("${ftpDownload.route}")
     private String ftpDownloadRoute;

src/main/java/info/aspirecn/iov/sjjh/supplier10000040/util/ExcelUtil.java

@@ -115,51 +115,90 @@ public class ExcelUtil {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+
+            if (hssfWorkbook != null) {
+                try {
+                    hssfWorkbook.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
         return list;
     }
 
     public static List<IllegalInfoFtpResult> readXlsx(String path) {
-        InputStream is;
+        InputStream is = null;
         XSSFWorkbook xssfWorkbook = null;
+        IllegalInfoFtpResult manFtpResult = null;
+        List<IllegalInfoFtpResult> list = new ArrayList<>();
+
         try {
+
             is = new FileInputStream(path);
             xssfWorkbook = new XSSFWorkbook(is);
 
+            // Read the Sheet
+            for (int numSheet = 0; numSheet < xssfWorkbook.getNumberOfSheets(); numSheet++) {
+                XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);
+                if (xssfSheet == null) {
+                    continue;
+                }
+
+                // Read the Row
+                for (int rowNum = 0; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
+                    XSSFRow xssfRow = xssfSheet.getRow(rowNum);
+                    if (xssfRow != null) {
+                        manFtpResult = new IllegalInfoFtpResult();
+                        XSSFCell traceId = xssfRow.getCell(0);
+                        XSSFCell name = xssfRow.getCell(1);
+                        XSSFCell idCard = xssfRow.getCell(2);
+                        XSSFCell isIdCard = xssfRow.getCell(3);
+                        XSSFCell isEscape = xssfRow.getCell(4);
+                        XSSFCell isPedigree = xssfRow.getCell(5);
+                        XSSFCell isDrugs = xssfRow.getCell(6);
+                        manFtpResult.setTraceId(getValue(traceId).toString());
+                        manFtpResult.setName(getValue(name).toString());
+                        manFtpResult.setIdCard(getValue(idCard).toString());
+                        manFtpResult.setIsIdCard(new BigDecimal(getValue(isIdCard).toString()).intValue());
+                        manFtpResult.setIsEscape(new BigDecimal(getValue(isEscape).toString()).intValue());
+                        manFtpResult.setIsPedigree(new BigDecimal(getValue(isPedigree).toString()).intValue());
+                        manFtpResult.setIsDrugs(new BigDecimal(getValue(isDrugs).toString()).intValue());
+                        list.add(manFtpResult);
+                    }
+                }
+            }
+
         } catch (IOException e) {
             e.printStackTrace();
-        }
-        IllegalInfoFtpResult manFtpResult = null;
-        List<IllegalInfoFtpResult> list = new ArrayList<IllegalInfoFtpResult>();
-        // Read the Sheet
-        for (int numSheet = 0; numSheet < xssfWorkbook.getNumberOfSheets(); numSheet++) {
-            XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);
-            if (xssfSheet == null) {
-                continue;
+        } finally {
+
+            if (xssfWorkbook != null) {
+                try {
+                    xssfWorkbook.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
-            // Read the Row
-            for (int rowNum = 0; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
-                XSSFRow xssfRow = xssfSheet.getRow(rowNum);
-                if (xssfRow != null) {
-                    manFtpResult = new IllegalInfoFtpResult();
-                    XSSFCell traceId = xssfRow.getCell(0);
-                    XSSFCell name = xssfRow.getCell(1);
-                    XSSFCell idCard = xssfRow.getCell(2);
-                    XSSFCell isIdCard = xssfRow.getCell(3);
-                    XSSFCell isEscape = xssfRow.getCell(4);
-                    XSSFCell isPedigree = xssfRow.getCell(5);
-                    XSSFCell isDrugs = xssfRow.getCell(6);
-                    manFtpResult.setTraceId(getValue(traceId).toString());
-                    manFtpResult.setName(getValue(name).toString());
-                    manFtpResult.setIdCard(getValue(idCard).toString());
-                    manFtpResult.setIsIdCard(new BigDecimal(getValue(isIdCard).toString()).intValue());
-                    manFtpResult.setIsEscape(new BigDecimal(getValue(isEscape).toString()).intValue());
-                    manFtpResult.setIsPedigree(new BigDecimal(getValue(isPedigree).toString()).intValue());
-                    manFtpResult.setIsDrugs(new BigDecimal(getValue(isDrugs).toString()).intValue());
-                    list.add(manFtpResult);
+
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
             }
         }
+
         return list;
     }
 
@@ -187,6 +226,7 @@ public class ExcelUtil {
         }
         //输出Excel文件
         wb.write(outputStream);
+        wb.close();
         outputStream.close();
         return null;
     }