湖北消金 - 提前还款文件

src/main/java/cn/quantgroup/financial/constant/HubeiCFCField.java

@@ -87,7 +87,7 @@ public class HubeiCFCField {
         {
             put(HubeiCFCDataType.RETURN_BATCH_DEBIT.get(),HubeiCFCDataType.RETURN_BATCH_DEBIT);
             put(HubeiCFCDataType.RETURN_BATCH_COMPENSATION.get(),HubeiCFCDataType.RETURN_BATCH_COMPENSATION);
-            put(HubeiCFCDataType.RETURN_BATCH_COMPENSATION.get(),HubeiCFCDataType.RETURN_BATCH_COMPENSATION);
+            put(HubeiCFCDataType.RETURN_ADVANCE_REPAYMENT.get(),HubeiCFCDataType.RETURN_ADVANCE_REPAYMENT);
             put(HubeiCFCDataType.SEND_DEBIT.get(),HubeiCFCDataType.SEND_DEBIT);
             put(HubeiCFCDataType.SEND_ADVANCE_REPAYMENT_CHECK.get(),HubeiCFCDataType.SEND_ADVANCE_REPAYMENT_CHECK);
         }

src/main/java/cn/quantgroup/financial/scheduler/HuBeiReturnDiscScheduler.java

@@ -69,7 +69,7 @@ public class HuBeiReturnDiscScheduler {
                 //保存并推送回盘文件
                 saveAndPushReturnDisc(huBeiHistoryList);
             } catch (Exception e) {
-                iHuBeiService.sendMailNotice(e.getMessage());
+                iHuBeiService.sendErrorMailNotice(e.getMessage());
                 logger.error(e.getMessage(),e);
             }
         }
@@ -117,7 +117,7 @@ public class HuBeiReturnDiscScheduler {
             scheduledExecutorService.schedule(scheduleAdvanceRepay, HubeiCFCField.thirtyMintes, TimeUnit.MINUTES);
         }
         if(debitResponse==null||advanceResponse==null||compensationResponse==null){
-            iHuBeiService.sendMailNotice("回盘文件发送失败，请悉知 联系相关人员");
+            iHuBeiService.sendErrorMailNotice("回盘文件发送失败，请悉知 联系相关人员");
         }
     }
 }
@@ -185,7 +185,7 @@ class ScheduleAdvanceRepay implements Runnable{
                 scheduleAdvanceRepay.registerService(scheduledExecutorService,iHuBeiService,iHuBeiCFCDao,huBeiHandlerDispatcher);
                 scheduledExecutorService.schedule(scheduleAdvanceRepay, HubeiCFCField.tenMinutes, TimeUnit.MINUTES);
             }else {
-                iHuBeiService.sendMailNotice("回盘提前还款文件失败，请悉知 联系相关人员");
+                iHuBeiService.sendErrorMailNotice("回盘提前还款文件失败，请悉知 联系相关人员");
             }
             logger.info("ScheduleAdvanceRepay method end");
         } catch (Exception e) {
@@ -207,7 +207,7 @@ class ScheduleAdvanceRepay implements Runnable{
                 }
             }
             String errorString = errorStringBuilder.toString();
-            iHuBeiService.sendMailNotice(errorString);
+            iHuBeiService.sendErrorMailNotice(errorString);
         } catch (Exception e) {
             logger.error(e.getMessage(),e);
         }

src/main/java/cn/quantgroup/financial/scheduler/HuBeiSendDiscScheduler.java

@@ -2,13 +2,9 @@ package cn.quantgroup.financial.scheduler;
 
 import cn.quantgroup.financial.constant.HubeiCFCDataType;
 import cn.quantgroup.financial.constant.HubeiCFCField;
-import cn.quantgroup.financial.dao.IHuBeiCFCDao;
 import cn.quantgroup.financial.model.huibeicfc.HuBeiCFCResponse;
-import cn.quantgroup.financial.model.huibeicfc.HuBeiDocName;
-import cn.quantgroup.financial.model.huibeicfc.HuBeiHistory;
 import cn.quantgroup.financial.service.IHuBeiService;
 import cn.quantgroup.financial.service.sys.IScheduledJudgeService;
-import cn.quantgroup.financial.util.HubeiCFCUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +12,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * 湖北每天的送盘文件每日定时任务
  * Created by WuKong on 2017/2/3.
@@ -47,14 +41,14 @@ public class HuBeiSendDiscScheduler {
                     logger.info("get sendDisc response success");
                 }else {
                     if(response==null){
-                        iHuBeiService.sendMailNotice("没有成功获取到送盘文件，响应为null");
+                        iHuBeiService.sendErrorMailNotice("没有成功获取到送盘文件，响应为null");
                     }else {
-                        iHuBeiService.sendMailNotice("没有成功获取到送盘文件，错误码="+response.getEc()+"|错误信息="+response.getEm());
+                        iHuBeiService.sendErrorMailNotice("没有成功获取到送盘文件，错误码="+response.getEc()+"|错误信息="+response.getEm());
                     }
                     logger.info("response is null or don`t return result={}",response);
                 }
             } catch (Exception e) {
-                iHuBeiService.sendMailNotice(e.getMessage());
+                iHuBeiService.sendErrorMailNotice(e.getMessage());
                 logger.error(e.getMessage(),e);
             }
         }

src/main/java/cn/quantgroup/financial/service/IHuBeiService.java

@@ -47,16 +47,23 @@ public interface IHuBeiService {
      * @param messageString
      */
     @Async
-    void sendMailNotice(String messageString);
+    void sendErrorMailNotice(String messageString);
     @Async
-    void sendMailNotice(List<HuBeiHistory> huBeiHistoryList,String noticeMessage);
+    void sendErrorMailNotice(List<HuBeiHistory> huBeiHistoryList, String noticeMessage);
 
     /**
      *  每日附件发送
      * @param hubeiCFCDataType
      * @param attachedBytes
      */
-    void sendMailAttachment(HubeiCFCDataType hubeiCFCDataType,ArrayList<DataSource> attachedBytes);
+    void sendMailAttachment(HubeiCFCDataType hubeiCFCDataType, ArrayList<DataSource> attachedBytes);
+
+    /**
+     *
+     * @param attachedBytes
+     * @param toUserArray
+     */
+    void sendErrorMailAttachment(ArrayList<DataSource> attachedBytes, String[] toUserArray, String text, String subject);
 
     HuBeiDocName generateHuBeiDoc(HubeiCFCDataType hubeiCFCDataType,Byte seqNo);
 }

src/test/java/cn/quantgroup/financial/service/HuBeiServiceTest.java

@@ -22,7 +22,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
 
 import javax.activation.DataSource;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -142,7 +141,7 @@ public class HuBeiServiceTest {
 
     @Test
     public void testSendMailNotice(){
-        huBeiService.sendMailNotice("test");
+        huBeiService.sendErrorMailNotice("test");
         synchronized (lock) {
             try {
                 lock.wait();