malk 1 день назад
Родитель
Сommit
b3bf14e89e

+ 13 - 18
mjava-xiding/src/main/java/com/malk/xiding/controller/XDController.java

@@ -58,25 +58,26 @@ public class XDController {
     private DDService ddService;
 
     @GetMapping("test")
-    McR test() {
+    McR test3() {
 
-        boolean isMarketing = ddService.matchDepartment(ddClient.getAccessToken(), "20443665131248560", Arrays.asList(37263540L));
-        return McR.success(isMarketing);
-    }
-
-    @PostMapping("test3")
-    McR test3(@RequestParam String name) {
+        String name = "黄欢";
+        Date sTime = UtilDateTime.parseDateTime("2026-04-07" + " 00:00:00");
+        Date eTime = UtilDateTime.parseDateTime("2026-04-07" + " 23:59:59");
 
-        Date sTime = UtilDateTime.parseDateTime("2024-01-29" + " 00:00:00");
-        Date eTime = UtilDateTime.parseDateTime("2024-02-02" + " 23:59:59");
-
-        //List<Map> records = fxkClient.getAttendance_All(fxkClient.getAccessToken(), fxkConf.getCorpId(), sTime.getTime(), eTime.getTime(), Arrays.asList(relationDao.findByName(name).getIdFxxk()));
-        List<Map> records = fxkClient.getAttendance_All(fxkClient.getAccessToken(), fxkConf.getCorpId(), sTime.getTime(), eTime.getTime(), Arrays.asList("FSUID_4B61D59E5E3BF3C631322184298E770B"));
+        List<Map> records = fxkClient.getAttendance_All(fxkClient.getAccessToken(), fxkConf.getCorpId(), sTime.getTime(), eTime.getTime(), Arrays.asList(relationDao.findByName(name).getIdFxxk()));
+//        List<Map> records = fxkClient.getAttendance_All(fxkClient.getAccessToken(), fxkConf.getCorpId(), sTime.getTime(), eTime.getTime(), Arrays.asList("FSUID_4B61D59E5E3BF3C631322184298E770B"));
         log.info("xxxx, {}", records.size());
 
         return McR.success(records);
     }
 
+    @PostMapping("test5")
+    McR test5() {
+
+//        ddClient_attendance.uploadAttendanceRecord(ddClient.getAccessToken(), "01184453430538751536", "纷享销客同步", "纷享销客同步", null, 1689555600000L);
+        return McR.success();
+    }
+
     @GetMapping("time")
     McR time() {
 
@@ -120,10 +121,4 @@ public class XDController {
         }
         return McR.success();
     }
-
-    @PostMapping("test5")
-    McR test5() {
-//        ddClient_attendance.uploadAttendanceRecord(ddClient.getAccessToken(), "01184453430538751536", "纷享销客同步", "纷享销客同步", null, 1689555600000L);
-        return McR.success();
-    }
 }

+ 0 - 30
mjava/target/classes/META-INF/spring-configuration-metadata.json

@@ -35,11 +35,6 @@
       "type": "com.malk.server.common.FilePath$Path",
       "sourceType": "com.malk.server.common.FilePath$Path"
     },
-    {
-      "name": "file.path",
-      "type": "com.malk.server.common.FilePath$Path",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
     {
       "name": "file.source",
       "type": "com.malk.server.common.FilePath$Source",
@@ -50,11 +45,6 @@
       "type": "com.malk.server.common.FilePath$Source",
       "sourceType": "com.malk.server.common.FilePath$Source"
     },
-    {
-      "name": "file.source",
-      "type": "com.malk.server.common.FilePath$Source",
-      "sourceType": "com.malk.server.common.FilePath$Source"
-    },
     {
       "name": "fxiaoke",
       "type": "com.malk.server.fxiaoke.FXKConf",
@@ -179,16 +169,6 @@
       "type": "java.lang.String",
       "sourceType": "com.malk.server.common.FilePath$Path"
     },
-    {
-      "name": "file.path.file",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
-    {
-      "name": "file.path.image",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
     {
       "name": "file.path.image",
       "type": "java.lang.String",
@@ -199,16 +179,6 @@
       "type": "java.lang.String",
       "sourceType": "com.malk.server.common.FilePath$Path"
     },
-    {
-      "name": "file.path.tmp",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Path"
-    },
-    {
-      "name": "file.source.fonts",
-      "type": "java.lang.String",
-      "sourceType": "com.malk.server.common.FilePath$Source"
-    },
     {
       "name": "file.source.fonts",
       "type": "java.lang.String",