锡鼎调整

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

@@ -1,6 +1,5 @@
 package com.malk.xiding.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.malk.Util.UtilDateTime;
 import com.malk.server.common.McR;
 import com.malk.server.fxiaoke.FXKConf;
@@ -11,11 +10,11 @@ import com.malk.service.dingtalk.DDService;
 import com.malk.service.fxiaoke.FXKClient;
 import com.malk.xiding.repository.dao.XdDdApproveRecordDao2;
 import com.malk.xiding.repository.dao.XdDdFxkRelationDao;
-import com.malk.xiding.repository.entity.XdFxkDdAttendancePo;
 import com.malk.xiding.server.XDConf;
 import com.malk.xiding.service.XDService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -61,7 +60,7 @@ public class XDController {
 
     @PostMapping("test3")
     McR test3(@RequestParam String name) {
-        Date sTime = UtilDateTime.parseDateTime("2023-05-04" + " 00:00:00");
+        Date sTime = UtilDateTime.parseDateTime("2023-07-01" + " 00:00:00");
         Date eTime = UtilDateTime.parseDateTime("2023-05-31" + " 23:59:59");
 
         List<Map> records = fxkClient.getAttendance_All(fxkClient.getAccessToken(), fxkConf.getCorpId(), sTime.getTime(), eTime.getTime(), Arrays.asList(relationDao.findByName(name).getIdFxxk()));
@@ -74,8 +73,11 @@ public class XDController {
 //        log.error("xxxx, {}", JSON.parseObject(JSON.toJSONString(records.get(0)), XdFxkDdAttendancePo.class));
 //
 //        log.info("xxxx, {}, {}", check, UtilDateTime.formatDateTime(new Date(tTime.getTime() - (tTime.getHours() + 1) * 60 * 60 * 1000)));
-        return McR.success(JSON.parseArray(JSON.toJSONString(records), XdFxkDdAttendancePo.class));
+//        return McR.success(JSON.parseArray(JSON.toJSONString(records), XdFxkDdAttendancePo.class));
 //        return McR.success(JSON.parseObject(JSON.toJSONString(records.get(0)), XdFxkDdAttendancePo.class));
+
+        return McR.success(approveRecordDao2.findAllByEndTimeAfterAndTypeAndMarketing(sTime, "出差", true, PageRequest.of(0, Integer.MAX_VALUE)));
+
     }
 
     @PostMapping("test1")
@@ -95,8 +97,8 @@ public class XDController {
 
     @PostMapping("test")
     McR test() {
-        long startTime = UtilDateTime.parseDateTime("2023-06-14" + " 00:00:00").getTime();
-        long endTime = UtilDateTime.parseDateTime("2023-06-14" + " 23:59:59").getTime();
+        long startTime = UtilDateTime.parseDateTime("2023-07-31" + " 00:00:00").getTime();
+        long endTime = UtilDateTime.parseDateTime("2023-08-05" + " 23:59:59").getTime();
         xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_CC, "出差");
 //        xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_WC, "外出");
         return McR.success();

mjava-xiding/src/main/java/com/malk/xiding/service/impl/XDImplService.java

@@ -25,6 +25,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -131,7 +132,7 @@ public class XDImplService implements XDService {
         }
         ddApproveRecordDao.save(approveRecordPo);
         log.info("同步出差和人员信息, {}, {}", userPo, approveRecordPo);
-        _attendanceSync(sTime, eTime, userPo.getIdFxxk(), userId, type);  // 兼容后补审批记录
+        _attendanceSync(sTime, eTime, userPo.getIdFxxk(), userId, type, approveRecordPo.isMarketing());  // 兼容后补审批记录
     }
 
     // 同步纷享销客人员信息
@@ -216,7 +217,7 @@ public class XDImplService implements XDService {
     }
 
     /// 后补审批单, 同步考勤
-    private void _attendanceSync(Date sTime, Date eTime, String openUserId, String ddUserId, String type) {
+    private void _attendanceSync(Date sTime, Date eTime, String openUserId, String ddUserId, String type, boolean marketing) {
         // [人员匹配 & 开始时间小于当前同步时间, 若当前时间大于结束时间取结束时间]
         Date syncTime = eTime.after(new Date()) ? new Date() : eTime;
         if (sTime.after(syncTime) || StringUtils.isBlank(openUserId)) {
@@ -235,10 +236,15 @@ public class XDImplService implements XDService {
                 _attendanceRule(attendancePo);
             });
         } else {
-            // 提交出差后, 就会有对应的排班, 无需重复查询; 同步时匹配出差结束时间, 不写入未来时间考勤
-            for (int day = sTime.getDate(); day <= eTime.getDate(); day++) {
-                log.info("出差后补 = {}, 考勤时间 = {}", ddUserId, day);
-                _attendanceRule(ddUserId, ddFxkRelationDao.findByIdDd(ddUserId).getName(), UtilDateTime.formatDate(new Date(sTime.getYear(), eTime.getMonth(), day)) + " 09:00:00");
+            // 仅同步营销部门人员
+            if (marketing) {
+                // 提交出差后, 就会有对应的排班, 无需重复查询; 同步时匹配出差结束时间, 不写入未来时间考勤
+                LocalDateTime ssTime = UtilDateTime.convertToLocalDateTimeFromDate(sTime);
+                while (ssTime.isBefore(UtilDateTime.convertToLocalDateTimeFromDate(syncTime))) {
+                    log.info("出差后补 = {}, 考勤时间 = {}", ddUserId, ssTime);
+                    _attendanceRule(ddUserId, ddFxkRelationDao.findByIdDd(ddUserId).getName(), UtilDateTime.formatLocalDate(ssTime.toLocalDate()) + " 09:00:00");
+                    ssTime = ssTime.plusDays(1);
+                }
             }
         }
     }

mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdDdApproveRecordPo.java

@@ -0,0 +1,62 @@
+package com.malk.xiding.repository.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QXdDdApproveRecordPo is a Querydsl query type for XdDdApproveRecordPo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QXdDdApproveRecordPo extends EntityPathBase<XdDdApproveRecordPo> {
+
+    private static final long serialVersionUID = 1676302969L;
+
+    public static final QXdDdApproveRecordPo xdDdApproveRecordPo = new QXdDdApproveRecordPo("xdDdApproveRecordPo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    public final DateTimePath<java.util.Date> endTime = createDateTime("endTime", java.util.Date.class);
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath instanceId = createString("instanceId");
+
+    public final BooleanPath marketing = createBoolean("marketing");
+
+    public final StringPath openUserId = createString("openUserId");
+
+    public final DateTimePath<java.util.Date> startTime = createDateTime("startTime", java.util.Date.class);
+
+    public final StringPath type = createString("type");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public final StringPath userId = createString("userId");
+
+    public final StringPath userName = createString("userName");
+
+    public QXdDdApproveRecordPo(String variable) {
+        super(XdDdApproveRecordPo.class, forVariable(variable));
+    }
+
+    public QXdDdApproveRecordPo(Path<? extends XdDdApproveRecordPo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QXdDdApproveRecordPo(PathMetadata metadata) {
+        super(XdDdApproveRecordPo.class, metadata);
+    }
+
+}
+

mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdDdFxkRelationPo.java

@@ -0,0 +1,56 @@
+package com.malk.xiding.repository.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QXdDdFxkRelationPo is a Querydsl query type for XdDdFxkRelationPo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QXdDdFxkRelationPo extends EntityPathBase<XdDdFxkRelationPo> {
+
+    private static final long serialVersionUID = -792800080L;
+
+    public static final QXdDdFxkRelationPo xdDdFxkRelationPo = new QXdDdFxkRelationPo("xdDdFxkRelationPo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath idDd = createString("idDd");
+
+    public final StringPath idFxxk = createString("idFxxk");
+
+    public final StringPath mobile = createString("mobile");
+
+    public final StringPath name = createString("name");
+
+    public final StringPath remark = createString("remark");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public QXdDdFxkRelationPo(String variable) {
+        super(XdDdFxkRelationPo.class, forVariable(variable));
+    }
+
+    public QXdDdFxkRelationPo(Path<? extends XdDdFxkRelationPo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QXdDdFxkRelationPo(PathMetadata metadata) {
+        super(XdDdFxkRelationPo.class, metadata);
+    }
+
+}
+

mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdFxkDdAttendancePo.java

@@ -0,0 +1,60 @@
+package com.malk.xiding.repository.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QXdFxkDdAttendancePo is a Querydsl query type for XdFxkDdAttendancePo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QXdFxkDdAttendancePo extends EntityPathBase<XdFxkDdAttendancePo> {
+
+    private static final long serialVersionUID = 226488349L;
+
+    public static final QXdFxkDdAttendancePo xdFxkDdAttendancePo = new QXdFxkDdAttendancePo("xdFxkDdAttendancePo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    public final StringPath checkAddress = createString("checkAddress");
+
+    public final DateTimePath<java.util.Date> checkTime = createDateTime("checkTime", java.util.Date.class);
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath idDd = createString("idDd");
+
+    public final StringPath openUserId = createString("openUserId");
+
+    public final StringPath outside = createString("outside");
+
+    public final StringPath remark = createString("remark");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public final StringPath userName = createString("userName");
+
+    public QXdFxkDdAttendancePo(String variable) {
+        super(XdFxkDdAttendancePo.class, forVariable(variable));
+    }
+
+    public QXdFxkDdAttendancePo(Path<? extends XdFxkDdAttendancePo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QXdFxkDdAttendancePo(PathMetadata metadata) {
+        super(XdFxkDdAttendancePo.class, metadata);
+    }
+
+}
+

mjava-xiding/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Jul 24 18:20:43 CST 2023
+version=1.0-SNAPSHOT
+groupId=com.malk
+artifactId=mjava-xiding

mjava-xiding/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,19 @@
+com/malk/xiding/repository/entity/XdFxkDdAttendancePo.class
+com/malk/xiding/repository/dao/XdFxkDdAttendanceDao.class
+com/malk/xiding/repository/entity/XdDdApproveRecordPo$XdDdApproveRecordPoBuilder.class
+com/malk/xiding/repository/dao/XdDdApproveRecordDao2.class
+com/malk/xiding/schedule/XDScheduleTask.class
+com/malk/xiding/repository/entity/XdDdFxkRelationPo$XdDdFxkRelationPoBuilder.class
+com/malk/xiding/repository/entity/XdDdFxkRelationPo.class
+com/malk/xiding/Boot.class
+com/malk/xiding/repository/dao/XdDdFxkRelationDao.class
+com/malk/xiding/controller/XDController.class
+com/malk/xiding/repository/entity/QXdFxkDdAttendancePo.class
+com/malk/xiding/server/XDConf.class
+com/malk/xiding/service/XDService.class
+com/malk/xiding/repository/entity/XdFxkDdAttendancePo$XdFxkDdAttendancePoBuilder.class
+com/malk/xiding/repository/entity/XdDdApproveRecordPo.class
+com/malk/xiding/repository/dao/XdDdApproveRecordDao.class
+com/malk/xiding/repository/entity/QXdDdApproveRecordPo.class
+com/malk/xiding/repository/entity/QXdDdFxkRelationPo.class
+com/malk/xiding/service/impl/XDImplService.class

mjava-xiding/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,16 @@
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/entity/XdFxkDdAttendancePo.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdFxkDdAttendanceDao.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/entity/XdDdApproveRecordPo.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdDdFxkRelationDao.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/schedule/XDScheduleTask.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/XDService.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdDdApproveRecordDao.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/server/XDConf.java
+/Users/malk/server/java-mcli-2/mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdDdFxkRelationPo.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/impl/XDImplService.java
+/Users/malk/server/java-mcli-2/mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdDdApproveRecordPo.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/controller/XDController.java
+/Users/malk/server/java-mcli-2/mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdFxkDdAttendancePo.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/entity/XdDdFxkRelationPo.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdDdApproveRecordDao2.java
+/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/Boot.java

mjava-xintianlong/src/main/java/com/malk/xintianlong/controller/HSController.java

@@ -435,6 +435,8 @@ public class HSController {
 //                .build());
 
 
-        return McR.success(approveRecordDao.findAllByOrderCodeIn(Arrays.asList("2023-03-014")));
+//        return McR.success(approveRecordDao.findAllByOrderCodeIn(Arrays.asList("2023-03-014")));
+
+        return McR.success(ddClient_workflow.getProcessInstanceId(ddClient.getAccessToken(), "wiwad6IWSgq1SiWQ2Nayhw06381687920077"));
     }
 }

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

@@ -35,6 +35,11 @@
       "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",
@@ -45,6 +50,11 @@
       "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",
@@ -169,6 +179,16 @@
       "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",
@@ -179,6 +199,16 @@
       "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",

mjava/target/generated-sources/java/com/malk/base/QBasePo.java

@@ -0,0 +1,41 @@
+package com.malk.base;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QBasePo is a Querydsl query type for BasePo
+ */
+@Generated("com.querydsl.codegen.SupertypeSerializer")
+public class QBasePo extends EntityPathBase<BasePo> {
+
+    private static final long serialVersionUID = -2112308225L;
+
+    public static final QBasePo basePo = new QBasePo("basePo");
+
+    public final DateTimePath<java.util.Date> createTime = createDateTime("createTime", java.util.Date.class);
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final DateTimePath<java.util.Date> updateTime = createDateTime("updateTime", java.util.Date.class);
+
+    public QBasePo(String variable) {
+        super(BasePo.class, forVariable(variable));
+    }
+
+    public QBasePo(Path<? extends BasePo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QBasePo(PathMetadata metadata) {
+        super(BasePo.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/base/QJpaMap.java

@@ -0,0 +1,37 @@
+package com.malk.base;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QJpaMap is a Querydsl query type for JpaMap
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QJpaMap extends EntityPathBase<JpaMap> {
+
+    private static final long serialVersionUID = -1869980976L;
+
+    public static final QJpaMap jpaMap = new QJpaMap("jpaMap");
+
+    public final StringPath id = createString("id");
+
+    public QJpaMap(String variable) {
+        super(JpaMap.class, forVariable(variable));
+    }
+
+    public QJpaMap(Path<? extends JpaMap> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QJpaMap(PathMetadata metadata) {
+        super(JpaMap.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/repository/entity/mutual/QMcAuthorizationPo.java

@@ -0,0 +1,70 @@
+package com.malk.repository.entity.mutual;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QMcAuthorizationPo is a Querydsl query type for McAuthorizationPo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QMcAuthorizationPo extends EntityPathBase<McAuthorizationPo> {
+
+    private static final long serialVersionUID = 823235005L;
+
+    public static final QMcAuthorizationPo mcAuthorizationPo = new QMcAuthorizationPo("mcAuthorizationPo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    public final StringPath appName = createString("appName");
+
+    public final StringPath appType = createString("appType");
+
+    public final StringPath corpId = createString("corpId");
+
+    public final StringPath corpName = createString("corpName");
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    public final NumberPath<Integer> delStatus = createNumber("delStatus", Integer.class);
+
+    public final StringPath deptId = createString("deptId");
+
+    public final StringPath deptName = createString("deptName");
+
+    public final StringPath description = createString("description");
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath remark = createString("remark");
+
+    public final StringPath systemToken = createString("systemToken");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public final StringPath userId = createString("userId");
+
+    public final StringPath userName = createString("userName");
+
+    public QMcAuthorizationPo(String variable) {
+        super(McAuthorizationPo.class, forVariable(variable));
+    }
+
+    public QMcAuthorizationPo(Path<? extends McAuthorizationPo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMcAuthorizationPo(PathMetadata metadata) {
+        super(McAuthorizationPo.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/repository/entity/primary/QMcTablePo.java

@@ -0,0 +1,50 @@
+package com.malk.repository.entity.primary;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QMcTablePo is a Querydsl query type for McTablePo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QMcTablePo extends EntityPathBase<McTablePo> {
+
+    private static final long serialVersionUID = 597816118L;
+
+    public static final QMcTablePo mcTablePo = new QMcTablePo("mcTablePo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath tDesc = createString("tDesc");
+
+    public final StringPath tName = createString("tName");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public QMcTablePo(String variable) {
+        super(McTablePo.class, forVariable(variable));
+    }
+
+    public QMcTablePo(Path<? extends McTablePo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMcTablePo(PathMetadata metadata) {
+        super(McTablePo.class, metadata);
+    }
+
+}
+

mjava/target/generated-sources/java/com/malk/repository/entity/slave/QJpaMapSlave.java

@@ -0,0 +1,40 @@
+package com.malk.repository.entity.slave;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QJpaMapSlave is a Querydsl query type for JpaMapSlave
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QJpaMapSlave extends EntityPathBase<JpaMapSlave> {
+
+    private static final long serialVersionUID = -1301758614L;
+
+    public static final QJpaMapSlave jpaMapSlave = new QJpaMapSlave("jpaMapSlave");
+
+    public final com.malk.base.QJpaMap _super = new com.malk.base.QJpaMap(this);
+
+    //inherited
+    public final StringPath id = _super.id;
+
+    public QJpaMapSlave(String variable) {
+        super(JpaMapSlave.class, forVariable(variable));
+    }
+
+    public QJpaMapSlave(Path<? extends JpaMapSlave> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QJpaMapSlave(PathMetadata metadata) {
+        super(JpaMapSlave.class, metadata);
+    }
+
+}
+

mjava/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Aug 04 18:56:26 CST 2023
+version=1.0-SNAPSHOT
+groupId=com.malk
+artifactId=mjava

mjava/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,5 @@
+com/malk/base/QBasePo.class
+com/malk/repository/entity/primary/QMcTablePo.class
+com/malk/repository/entity/mutual/QMcAuthorizationPo.class
+com/malk/base/QJpaMap.class
+com/malk/repository/entity/slave/QJpaMapSlave.class

mjava/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,110 @@
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/h3yun/CYR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/aliwork/YDR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java
+/Users/malk/server/java-mcli-2/mjava/target/generated-sources/java/com/malk/repository/entity/slave/QJpaMapSlave.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/ekuaibao/impl/EKBClientImpl.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/xbongbong/XBBClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilMc.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliwork/YDClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/delegate/DDEvent_Delegate.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient_Workflow.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/McPage.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/dao/slave/McTableDao.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/base/BaseDao.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/tencent/impl/TXYImplInvoice.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/xbongbong/impl/XBBImplClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/FilePath.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/tencent/TXYConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/VenR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/aliwork/YDConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/config/JpaConfiguration.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliyun/impl/ALYInvoiceImpl.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilVendor.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/fxiaoke/FXXR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/entity/slave/McTablePo.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilHttp.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/h3yun/CYConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Filter/ExceptionNotice.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/dingtalk/DDR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/entity/slave/JpaMapSlave.java
+/Users/malk/server/java-mcli-2/mjava/target/generated-sources/java/com/malk/base/QBasePo.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient_Contacts.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/McException.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/JSPTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Filter/RequestInterceptor.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilExcel.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/YDTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/McR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/ekuaibao/EKBConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient_Event.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Filter/CatchException.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/schedule/McScheduleTask.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/delegate/impl/DDImplEvent_Delegate.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Filter/RequestFilter.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/config/mutilSource/PrimaryConfig.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliwork/impl/YDServiceImpl.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/ekuaibao/EKBR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/entity/mutual/McAuthorizationPo.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/fxiaoke/FXKConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/dingtalk/DDR_New.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/dingtalk/crypto/DingCallbackCrypto.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/dingtalk/DDFormComponentDto.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient_Event.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilImport.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilConvert.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/McConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilDateTime.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/common/McREnum.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/base/BaseRepository.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilList.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/config/mutilSource/DataSourceConfig.java
+/Users/malk/server/java-mcli-2/mjava/target/generated-sources/java/com/malk/base/QJpaMap.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/config/mutilSource/SlaveConfig.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilMap.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/config/WebConfiguration.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/base/JpaMap.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/DSTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/dto/User.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/core/AsyncConfig.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/h3yun/impl/CYImplClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilEnv.java
+/Users/malk/server/java-mcli-2/mjava/target/generated-sources/java/com/malk/repository/entity/mutual/QMcAuthorizationPo.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilMath.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/fxiaoke/FXKClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/controller/DDCallbackController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/McTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/tencent/TXYInvoice.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient_Attendance.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilNumber.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/RESTFulTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/dto/Async2Sync.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/DDTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/dao/mutual/McAuthorizationDao.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient_Storage.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/base/BaseDto.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Boot.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliwork/YDService.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient_Workflow.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient_Storage.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/test/MGTestController.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/dingtalk/DDConf.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilFile.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/entity/primary/McTablePo.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/aliyun/ALYR.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplClient_Attendance.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilString.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/server/aliwork/YDParam.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/fxiaoke/impl/FXKImplClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/aliyun/ALYInvoice.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/repository/dao/primary/McTableDao.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/h3yun/CYClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilServlet.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/ekuaibao/EKBClient.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/impl/DDImplService.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient_Contacts.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/base/BasePo.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/Util/UtilToken.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDService.java
+/Users/malk/server/java-mcli-2/mjava/src/main/java/com/malk/service/dingtalk/DDClient.java
+/Users/malk/server/java-mcli-2/mjava/target/generated-sources/java/com/malk/repository/entity/primary/QMcTablePo.java