wucl 8 месяцев назад
Родитель
Сommit
d5e84d987f

+ 68 - 0
biz-base/src/main/java/com/dayou/controller/DyoaController.java

@@ -0,0 +1,68 @@
+package com.dayou.controller;
+
+import com.dayou.annotation.IgnoreAuth;
+import com.dayou.dyoa.IDyoaHistoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * DYOA 手动同步dyoa数据
+ *
+ * @author wucl
+ * @since 2023-01-10
+ */
+@RestController
+@RequestMapping("dyoa")
+@Slf4j
+public class DyoaController {
+
+
+
+    @Autowired
+    private IDyoaHistoryService dyoaHistoryService;
+
+    @IgnoreAuth
+    @GetMapping("/personData")
+    public void syncDyoaPersonalData(){
+        dyoaHistoryService.fetchDyoaPersonalOrder();
+        log.info("同步个贷数据完成");
+    }
+
+    @IgnoreAuth
+    @GetMapping("/majorData")
+    public void syncDyoaMajorData(){
+        dyoaHistoryService.fetchDyoaMajorOrderProduction();
+        log.info("同步大中型数据完成");
+    }
+
+    @IgnoreAuth
+    @GetMapping("/assetsData")
+    public void syncAssetsData(){
+        dyoaHistoryService.fetchAssetsOrderProduction();
+        log.info("同步资产数据完成");
+    }
+
+    @IgnoreAuth
+    @GetMapping("/realAmountData")
+    public void syncRealAmountData(){
+        dyoaHistoryService.fetchRealAmount();
+        log.info("同步实收款数据完成");
+    }
+
+    @IgnoreAuth
+    @GetMapping("/realClaimData")
+    public void syncRealClaimData(){
+        dyoaHistoryService.fetchRealAmountClaimData();
+        log.info("同步实收款认领数据完成");
+    }
+
+    @IgnoreAuth
+    @GetMapping("/invoiceData")
+    public void syncFinanceInvoiceData(){
+        dyoaHistoryService.fetchFinanceInvoiceRecord();
+        log.info("同步财务开票数据完成");
+    }
+}

+ 4 - 5
biz-base/src/main/java/com/dayou/controller/PageOfficeController.java

@@ -17,21 +17,20 @@ public class PageOfficeController {
         //获取doc目录的磁盘路径
     private static String OPT = "/opt";
     @RequestMapping(value="/openFile")
-    public String openFile(HttpServletRequest request, int file_id, String file_name)  {
+    public String openFile(HttpServletRequest request, String fileName, String fileUrl)  {
         //file_id和file_name是为了展示如何使用参数,我们这里只用到了file_name
         PageOfficeCtrl poCtrl = new PageOfficeCtrl(request);
         //webOpen的第一个参数支持能够输出下载文件的Url相对地址或者文件在服务器上的磁盘路径两种方式
         //查看详细,请在"https://www.pageoffice.cn/"搜索“PageOffice属性或方法中涉及到的URL路径或磁盘路径的说明”
-        poCtrl.webOpen("file://"+OPT+file_name, OpenModeType.docNormalEdit, "");
+        poCtrl.webOpen("file://"+OPT+fileUrl, OpenModeType.docNormalEdit, "");
         return poCtrl.getHtmlCode();//必须
     }
 
     @RequestMapping("/saveFile")
-    public void saveFile(HttpServletRequest request, HttpServletResponse response, int file_id, String file_name)  {
+    public void saveFile(HttpServletRequest request, HttpServletResponse response, String fileName, String fileUrl)  {
         //file_id和file_name是为了展示如何使用参数,我们这里只用到了file_name
         FileSaver fs = new FileSaver(request, response);
-        System.out.print("======》"+file_name);
-        fs.saveToFile(OPT + file_name);
+        fs.saveToFile(OPT + fileUrl);
         fs.close();
     }
 }

+ 1 - 1
biz-base/src/test/java/history/SyncHistoryTest.java

@@ -113,6 +113,6 @@
 //
 //    @Test
 //    public void getLandTargetMajorTest() throws NoSuchFieldException, IllegalAccessException {
-//       dyoaHistoryService.fetchRealAmount();
+//       dyoaHistoryService.fetchFinanceInvoiceRecord();
 //    }
 //}

+ 7 - 3
service/src/main/java/com/dayou/dyoa/DyoaHistoryServiceImpl.java

@@ -802,9 +802,13 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
                                     String productionType = getProductionType((String) value);
                                     xFiled.set(assetsProduction, productionType);
                                     break;
-                                case "createdDatetime":
-                                    Timestamp ts = (Timestamp) value;
-                                    field.set(assetsProduction, DateUtils.dateToLocalDate(new Date(ts.getTime())));
+                                case "createProductionDate":
+                                    Date ts = (Date) value;
+                                    LocalDate value1 = DateUtils.dateToLocalDate(ts);
+                                    System.out.println("value1===>" + value1);
+                                    if (value1!=null){
+                                        xFiled.set(assetsProduction, value1);
+                                    }
                                     break;
                                 default:
                                     xFiled.set(assetsProduction,value);

+ 43 - 43
service/src/main/java/com/dayou/dyoa/task/FetchDyoaDataSchedule.java

@@ -13,47 +13,47 @@ public class FetchDyoaDataSchedule {
     @Autowired
     private IDyoaHistoryService dyoaHistoryService;
 
-//    //每天凌晨01:30触发
-//    @Scheduled(cron = "0 30 1 * * ?")
-//    public void syncDyoaPersonalData(){
-//        dyoaHistoryService.fetchDyoaPersonalOrder();
-//        log.info("同步个贷数据完成");
-//    }
-//
-//    //每天凌晨02:30触发
-//    @Scheduled(cron = "0 30 2 * * ?")
-//    public void syncDyoaMajorData(){
-//        dyoaHistoryService.fetchDyoaMajorOrderProduction();
-//        log.info("同步大中型数据完成");
-//    }
-//
-
-
-//    //每天凌晨03:30触发
-//    @Scheduled(cron = "0 30 3 * * ?")
-//    public void syncAssetsData(){
-//        dyoaHistoryService.fetchAssetsOrderProduction();
-//        log.info("同步资产数据完成");
-//    }
-
-//    //每天凌晨04:30触发
-//    @Scheduled(cron = "0 30 4 * * ?")
-//    public void syncRealAmountData(){
-//        dyoaHistoryService.fetchRealAmount();
-//        log.info("同步实收款数据完成");
-//    }
-//
-//    //每天凌晨05:00触发
-//    @Scheduled(cron = "0 0 5 * * ?")
-//    public void syncRealClaimData(){
-//        dyoaHistoryService.fetchRealAmountClaimData();
-//        log.info("同步实收款认领数据完成");
-//    }
-
-//    //每天凌晨06:00触发
-//    @Scheduled(cron = "0 0 6 * * ?")
-//    public void syncFinanceInvoiceData(){
-//        dyoaHistoryService.fetchFinanceInvoiceRecord();
-//        log.info("同步财务开票数据完成");
-//    }
+    //每天凌晨01:30触发
+    @Scheduled(cron = "0 30 1 * * ?")
+    public void syncDyoaPersonalData(){
+        dyoaHistoryService.fetchDyoaPersonalOrder();
+        log.info("同步个贷数据完成");
+    }
+
+    //每天凌晨02:30触发
+    @Scheduled(cron = "0 30 2 * * ?")
+    public void syncDyoaMajorData(){
+        dyoaHistoryService.fetchDyoaMajorOrderProduction();
+        log.info("同步大中型数据完成");
+    }
+
+
+
+    //每天凌晨03:30触发
+    @Scheduled(cron = "0 30 3 * * ?")
+    public void syncAssetsData(){
+        dyoaHistoryService.fetchAssetsOrderProduction();
+        log.info("同步资产数据完成");
+    }
+
+    //每天凌晨04:30触发
+    @Scheduled(cron = "0 30 4 * * ?")
+    public void syncRealAmountData(){
+        dyoaHistoryService.fetchRealAmount();
+        log.info("同步实收款数据完成");
+    }
+
+    //每天凌晨05:00触发
+    @Scheduled(cron = "0 0 5 * * ?")
+    public void syncRealClaimData(){
+        dyoaHistoryService.fetchRealAmountClaimData();
+        log.info("同步实收款认领数据完成");
+    }
+
+    //每天凌晨06:00触发
+    @Scheduled(cron = "0 0 6 * * ?")
+    public void syncFinanceInvoiceData(){
+        dyoaHistoryService.fetchFinanceInvoiceRecord();
+        log.info("同步财务开票数据完成");
+    }
 }