版本更新

mjava-guyuan/src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

mjava-hangshi/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

mjava-jisuanji/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

mjava-lichen/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

mjava-minjiaoyuan/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

mjava-rongzhi/src/main/java/com/malk/rongzhi/service/impl/RZServiceImpl.java

@@ -81,8 +81,8 @@ public class RZServiceImpl implements RZService {
         for (int i = 0; i < userIds.size(); i += 50) {
             int to = (i + 50) > userIds.size() ? userIds.size() : i + 50;
 
-            LocalDateTime now = LocalDateTime.now();
-//            LocalDateTime now = UtilDateTime.parseLocalDateTime("2023-09-14 22:00:00");
+//            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime now = UtilDateTime.parseLocalDateTime("2026-04-14 22:00:00");
             // 考勤范围从当日 7.30 到次日 7.30, 查询时间需要调整 fixme: [凌晨以后同步新的考勤时段]
             String from = "", end = "";
             if (now.getHour() <= 7) {
@@ -94,8 +94,8 @@ public class RZServiceImpl implements RZService {
             }
 //            from = from + " 07:30:00";
 //            end = end + " 07:29:59";
-            from = "2025-03-03" + " 07:30:00";
-            end = "2025-03-04" + " 07:29:59";
+            from = "2026-04-14" + " 07:30:00";
+            end = "2026-04-15" + " 07:29:59";
             // 匹配数据考勤
             List<String> users = userIds.subList(i, to);
             List<Map> list = ddClient_attendance.listAttendanceRecord(getAccessToken(RZConf.TYPE.dingtalk), users, from, end);

mjava-rongzhi/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     hibernate:
       ddl-auto: none      # JPA对表没有任何操作

mjava-rongzhi/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

mjava-rongzhi/target/generated-sources/java/com/malk/rongzhi/repository/entity/QRzEkbRecordPo.java

@@ -1,52 +0,0 @@
-package com.malk.rongzhi.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;
-
-
-/**
- * QRzEkbRecordPo is a Querydsl query type for RzEkbRecordPo
- */
-@Generated("com.querydsl.codegen.EntitySerializer")
-public class QRzEkbRecordPo extends EntityPathBase<RzEkbRecordPo> {
-
-    private static final long serialVersionUID = 14758822L;
-
-    public static final QRzEkbRecordPo rzEkbRecordPo = new QRzEkbRecordPo("rzEkbRecordPo");
-
-    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
-
-    public final StringPath checkDate = createString("checkDate");
-
-    //inherited
-    public final DateTimePath<java.util.Date> createTime = _super.createTime;
-
-    //inherited
-    public final NumberPath<Long> id = _super.id;
-
-    public final StringPath name = createString("name");
-
-    //inherited
-    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
-
-    public final StringPath userId = createString("userId");
-
-    public QRzEkbRecordPo(String variable) {
-        super(RzEkbRecordPo.class, forVariable(variable));
-    }
-
-    public QRzEkbRecordPo(Path<? extends RzEkbRecordPo> path) {
-        super(path.getType(), path.getMetadata());
-    }
-
-    public QRzEkbRecordPo(PathMetadata metadata) {
-        super(RzEkbRecordPo.class, metadata);
-    }
-
-}
-

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

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Sep 09 21:28:40 CST 2024
-version=1.0-SNAPSHOT
-groupId=com.malk
-artifactId=mjava-rongzhi

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

@@ -1,13 +0,0 @@
-com/malk/rongzhi/service/impl/RZServiceImpl.class
-com/malk/rongzhi/repository/entity/RzEkbRecordPo$RzEkbRecordPoBuilder.class
-com/malk/rongzhi/schedule/RZScheduleTask.class
-com/malk/rongzhi/service/RZService.class
-com/malk/rongzhi/repository/entity/RzEkbRecordPo.class
-com/malk/rongzhi/Boot.class
-com/malk/rongzhi/controller/ShiJianGuanController.class
-com/malk/rongzhi/repository/dao/RzEkbRecordDao.class
-com/malk/rongzhi/server/RZConf$TYPE.class
-com/malk/rongzhi/server/RZConf.class
-com/malk/rongzhi/controller/RongZhiController.class
-com/malk/rongzhi/server/RZR.class
-com/malk/rongzhi/repository/entity/QRzEkbRecordPo.class

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

@@ -1,11 +0,0 @@
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/Boot.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/controller/ShiJianGuanController.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/controller/RongZhiController.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/schedule/RZScheduleTask.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/repository/entity/RzEkbRecordPo.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/service/RZService.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/repository/dao/RzEkbRecordDao.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/service/impl/RZServiceImpl.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/server/RZR.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/server/RZConf.java
-/Users/malk/server/java-mcli-2/mjava-rongzhi/target/generated-sources/java/com/malk/rongzhi/repository/entity/QRzEkbRecordPo.java

mjava-shanghaishiwei/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platformw: org.hibernate.dialect.MySQL57Dialect

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

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Jul 25 01:14:56 CST 2024
-version=1.0-SNAPSHOT
-groupId=com.malk
-artifactId=mjava-shanghaishiwei

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

@@ -1,8 +0,0 @@
-com/malk/shanghaishiwei/Boot.class
-com/malk/shanghaishiwei/server/HTConf.class
-com/malk/shanghaishiwei/service/impl/HTImplService.class
-com/malk/shanghaishiwei/service/HTClient.class
-com/malk/shanghaishiwei/service/impl/HTImplClient.class
-com/malk/shanghaishiwei/controller/SHHWController.class
-com/malk/shanghaishiwei/server/HTR.class
-com/malk/shanghaishiwei/service/HTService.class

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

@@ -1,8 +0,0 @@
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/service/HTClient.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/service/impl/HTImplClient.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/service/HTService.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/server/HTConf.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/service/impl/HTImplService.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/controller/SHHWController.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/server/HTR.java
-/Users/malk/server/java-mcli-2/mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/Boot.java

mjava-shijianguan/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

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

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Jul 25 01:14:17 CST 2024
-version=1.0-SNAPSHOT
-groupId=com.malk
-artifactId=mjava-shijianguan

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

@@ -1,2 +0,0 @@
-com/malk/shijianguan/controller/ShiJianGuanController.class
-com/malk/shijianguan/Boot.class

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

@@ -1,2 +0,0 @@
-/Users/malk/server/java-mcli-2/mjava-shijianguan/src/main/java/com.malk.shijianguan/Boot.java
-/Users/malk/server/java-mcli-2/mjava-shijianguan/src/main/java/com.malk.shijianguan/controller/ShiJianGuanController.java

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

@@ -1,6 +1,7 @@
 package com.malk.xiding.controller;
 
 import com.malk.Util.UtilDateTime;
+import com.malk.Util.UtilMap;
 import com.malk.server.common.McException;
 import com.malk.server.common.McR;
 import com.malk.server.fxiaoke.FXKConf;
@@ -14,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -74,15 +76,23 @@ public class XDController {
         return McR.success(records);
     }
 
+    @GetMapping("time")
+    McR time() {
+
+        Map map = UtilMap.map("t1, t2", new Date(), LocalDateTime.now());
+
+        return McR.success(map);
+    }
+
     @Autowired
     private DDClient_Workflow ddClient_workflow;
 
     @GetMapping("sync/approve")
-    McR approve() {
+    McR approve(@RequestParam(required = false) int days) {
 
         log.info("###### [XD]同步审批单开始 ######");
-        long endTime = new Date().getTime() - 0 * 24 * 60 * 60 * 1000L;
-        long startTime = endTime - 45 * 24 * 60 * 60 * 1000L;
+        long endTime = new Date().getTime() - days * 24 * 60 * 60 * 1000L;
+        long startTime = endTime - (days + 45) * 24 * 60 * 60 * 1000L;
         xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_CC, "出差");
         xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_WC, "外出");
         return McR.success();

mjava-xiding/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     hibernate:
       ddl-auto: none      # JPA对表没有任何操作

mjava-xiding/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
   jpa:
     database: MYSQL
     database-platform: org.hibernate.dialect.MySQL57Dialect

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

@@ -1,5 +1,3 @@
-#Generated by Maven
-#Thu Oct 05 21:01:53 CST 2023
-version=1.0-SNAPSHOT
-groupId=com.malk
 artifactId=mjava-xiding
+groupId=com.malk
+version=1.0-SNAPSHOT

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

@@ -1,22 +1,3 @@
-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/service/impl/GSImplClient.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/controller/GSController.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/service/GSClient.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

@@ -1,19 +1,19 @@
-/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/GSClient.java
-/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/impl/GSImplClient.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/controller/GSController.java
-/Users/malk/server/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/Boot.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/schedule/XDScheduleTask.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/entity/XdFxkDdAttendancePo.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/impl/XDImplService.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdDdFxkRelationPo.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/XDService.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/Boot.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/server/XDConf.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdFxkDdAttendanceDao.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/controller/GSController.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdDdFxkRelationDao.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/controller/XDController.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/impl/GSImplClient.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdDdApproveRecordDao2.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdDdApproveRecordPo.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/service/GSClient.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/dao/XdDdApproveRecordDao.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/entity/XdDdFxkRelationPo.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/target/generated-sources/java/com/malk/xiding/repository/entity/QXdFxkDdAttendancePo.java
+/Users/malk/server/pre/java-mcli-2/mjava-xiding/src/main/java/com/malk/xiding/repository/entity/XdDdApproveRecordPo.java

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

@@ -3,8 +3,11 @@ package com.malk.xintianlong.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.malk.Util.UtilMap;
+import com.malk.Util.UtilNumber;
+import com.malk.base.BaseDto;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
+import com.malk.server.aliwork.YDR;
 import com.malk.server.common.McException;
 import com.malk.server.common.McR;
 import com.malk.server.dingtalk.DDConf;
@@ -14,22 +17,24 @@ import com.malk.service.aliwork.YDClient;
 import com.malk.service.dingtalk.DDClient;
 import com.malk.service.dingtalk.DDClient_Workflow;
 import com.malk.xintianlong.repository.dao.primary.HSApproveRecordDao;
+import com.malk.xintianlong.repository.dao.primary.HSViewDao;
 import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
 import com.malk.xintianlong.server.HSConf;
 import com.malk.xintianlong.service.HSService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 错误抛出与拦截详见CatchException
@@ -45,227 +50,6 @@ public class HSController {
     @Autowired
     private DDClient_Workflow ddClient_workflow;
 
-    @Autowired
-    private HSApproveRecordDao approveRecordDao;
-
-    @Autowired
-    private HSService hsService;
-
-    /**
-     * 市场布结算单审批
-     */
-    @PostMapping("dd/scb-jsd")
-    McR marketApprove(@RequestBody Map data, HttpServletRequest request) {
-
-        log.info("市场布结算单审批, {}", data);
-        data.put("corpType", "01"); // prd 市场布, 只有金塔的
-        hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
-
-        // 组件数据格式化
-        data.put("salesmanCodeDing", JSON.toJSONString(Arrays.asList(data.get("salesmanCode"))));
-        Map ruleForm = UtilMap.map("orderCode, proposerDate, salesmanCodeDing", "结算单号, 出货日期, 业务员");
-        ruleForm.put("taskCode", "指定书号");
-        ruleForm.put("purchaseCorp", "要货单位");
-        ruleForm.put("productiionName", "产品编码");
-        ruleForm.put("transportationCode", "调运单号");
-        ruleForm.put("totalPrice", "实收加工费(元)");
-
-        Map ruleDetail = UtilMap.map("casting", UtilMap.map("taskCode, size, count, supplier, remark", "指定书号, 品名/规格, 数量, 供应商, 备注"));
-        ruleForm.put("casting", "市场布坯布详情");
-
-        ruleDetail.put("shipment", UtilMap.map("taskCode, constructCode, size, color, num, count, price, total, remark", "指定书号, 合同号, 品名/规格, 颜色, 件数, 数量, 单价, 金额（元）, 备注"));
-        ruleForm.put("shipment", "市场布成品详情");
-
-        // 推送钉钉审批
-        List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, ruleDetail);
-
-        String userId = String.valueOf(data.get("proposerCode"));
-        Map extInfo = UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT);
-        String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, HSConf.MARKET_CODE_DD, formValues, extInfo);
-
-        // 保存推送记录
-        HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
-        po.setProcessInstanceId(processInstanceId);
-        po.setRemark("市场布结算单");
-        po.setFormType("TM001");
-        approveRecordDao.save(po);
-
-        return McR.success(po);
-    }
-
-    /**
-     * 推送申购单审批
-     */
-    @PostMapping("dd/sgd")
-    McR purchaseApprove(@RequestBody Map data, HttpServletRequest request) {
-
-        log.info("推送申购单审批, {}", data);
-        hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
-
-        // 组件数据格式化
-        data.put("corpTypeName", HSConf.SUB_CORP_DD.get(data.get("corpType")));
-        Map ruleForm = UtilMap.map("corpTypeName, orderCode, proposerDate, purchaseType, department, category, goods", "公司主体, 请购单号, 请购日期, 采购类型, 申请部门, 采购项目, 采购明细");
-        Map ruleDetail = UtilMap.map("name, size, num, remark, price, supplier", "物品名称, 规格, 数量, 备注, 最近入库单价（元/吨）, 供应商");
-
-        // 推送钉钉审批
-        List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, ruleDetail);
-        String userId = String.valueOf(data.get("proposerCode"));
-        Map extInfo = UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT);
-        String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, HSConf.PURCHASE_CODE_DD, formValues, extInfo);
-
-        // 保存推送记录
-        HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
-        po.setProcessInstanceId(processInstanceId);
-        po.setRemark("采购申请单");
-        po.setFormType("PU001");
-        approveRecordDao.save(po);
-
-        return McR.success(po);
-    }
-
-    /**
-     * 推送结算单审批
-     */
-    @PostMapping("dd/jsd")
-    McR settleApprove(@RequestBody Map data, HttpServletRequest request) {
-
-        log.info("推送结算单审批, {}", data);
-        hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
-
-        // 组件数据格式化
-        data.put("corpTypeName", HSConf.SUB_CORP_DD.get(data.get("corpType")));
-        data.put("salesmanCodeDing", JSON.toJSONString(Arrays.asList(data.get("salesmanCode"))));
-        if (StringUtils.isNotBlank(String.valueOf(data.get("transportationCode2")))) {
-            data.put("transportationCode", data.get("transportationCode") + "/" + data.get("transportationCode2"));
-        }
-        if (StringUtils.isNotBlank(String.valueOf(data.get("proposerDate2")))) {
-            data.put("proposerDate", data.get("proposerDate") + "/" + data.get("proposerDate2"));
-        }
-        Map ruleForm = UtilMap.map("corpTypeName, orderCode, proposerDate, salesmanCodeDing", "所属公司, 结算单号, 出货日期, 业务员");
-        ruleForm.put("taskCode", "指定书号");
-        ruleForm.put("purchaseCorp", "要货单位");
-        ruleForm.put("invoiceNumber", "发票号");
-        ruleForm.put("productiionName", "产品名称");
-        ruleForm.put("transportationCode", "调运单号");
-        ruleForm.put("processingCharges", "加工费详情");
-        ruleForm.put("totalPrice", "实收加工费(元)");
-
-        Map ruleDetail = UtilMap.map("casting", UtilMap.map("taskCode, groupCode, size, count, price, total, supplier, remark", "指定书号, 组号, 品名/规格, 数量(米), 单价, 金额（元）, 供坯商, 备注"));
-        ruleForm.put("casting", "投坯详情");
-
-        ruleDetail.put("shipment", UtilMap.map("taskCode, groupCode, constructCode, size, num, count, price, total, priceSpread, remark", "指定书号, 组号, 合同号, 品名/规格, 件数, 数量(米), 单价, 金额（元）, 辅料差价(元), 备注"));
-        ruleForm.put("shipment", "成品出货详情");
-
-        ruleDetail.put("residue", UtilMap.map("taskCode, groupCode, size, num, count, price, total, otherPrice, remark", "指定书号, 组号, 品名/规格, 件数, 数量(米), 单价, 金额（元）, 其他金额(元), 备注"));
-        ruleForm.put("residue", "余坯款");
-
-        // 推送钉钉审批
-        List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, ruleDetail);
-
-        String userId = String.valueOf(data.get("proposerCode"));
-        Map extInfo = UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT);
-        String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, HSConf.SETTLE_CODE_DD, formValues, extInfo);
-
-        // 保存推送记录
-        HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
-        po.setProcessInstanceId(processInstanceId);
-        po.setRemark("结算申请单");
-        po.setFormType("TS001");
-        approveRecordDao.save(po);
-
-        return McR.success(po);
-    }
-
-    /**
-     * 推送指定书审批
-     */
-    @PostMapping("dd/zds")
-    McR assignmentLetter(@RequestBody Map data, HttpServletRequest request) {
-
-        data.put("test", "是");
-        log.info("推送指定书审批, {}", data);
-        hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
-
-        // 组件数据格式化
-        String userId = String.valueOf(data.get("proposerCode"));
-        String orderCode = String.valueOf(data.get("orderCode"));
-        data.put("corpTypeName", HSConf.SUB_CORP_DD.get(data.get("corpType")));
-        data.put("proposerCodeDing", JSON.toJSONString(Arrays.asList(userId)));
-        data.put("salesmanCodeDing", JSON.toJSONString(Arrays.asList(data.get("salesmanCode"))));
-        Map detry = ddClient.uploadFileFormUrl(ddClient.getAccessToken(), userId, HSConf.getAttachmentUrl(orderCode, String.valueOf(data.get("corpType"))), orderCode);
-        data.put("attachmentId", DDFormComponentDto.formatAttachment(detry));
-
-        // 推送钉钉审批
-        Map ruleForm = UtilMap.map("corpTypeName, orderCode, proposerCodeDing, proposerDate, consignee, salesmanCodeDing, attachmentId, test", "公司主体, 指定书号, 制单人, 制单日期, 要货单位, 业务员, 附件, 单选框");
-        List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, null);
-        String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, "PROC-BEA7B05C-1BFD-4194-A241-354611378D74", formValues, UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT));
-
-        // 保存推送记录
-        HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
-        po.setProcessInstanceId(processInstanceId);
-        po.setRemark("生产任务指定书");
-        po.setFormType("SD001");
-        approveRecordDao.save(po);
-
-        return McR.success(po);
-    }
-
-    @Autowired
-    HSApproveRecordDao hsApproveRecordDao;
-
-    /**
-     * 钉钉审批回调 [连接器-同意] - 废弃
-     */
-//    @PostMapping("dd/approve")
-    McR purchaseApproveCallback(@RequestBody Map<String, String> data) {
-
-        log.info("###### [HS]开始同步审批中记录 ######");
-        List<HSApproveRecordPo> list = hsApproveRecordDao.findAllByApproveResult("process");
-        log.info("同步数量, {}", list.size());
-        for (HSApproveRecordPo po : list) {
-            Map rsp = ddClient_workflow.getProcessInstanceId(ddClient.getAccessToken(), po.getProcessInstanceId());
-            if (Arrays.asList("RUNNING", "NEW").contains(rsp.get("status"))) {
-                continue;
-            }
-            if (Arrays.asList("TERMINATED", "CANCELED").contains(rsp.get("status"))) {
-                hsService.syncApproveResult2Hs(po.getProcessInstanceId(), "terminated");
-            }
-            if (StringUtils.isNotBlank(String.valueOf(rsp.get("result")))) {
-                hsService.syncApproveResult2Hs(po.getProcessInstanceId(), "agree".equals(String.valueOf(rsp.get("result"))) ? "agree" : "refuse");
-            }
-        }
-//        log.info("申购单审批回调, {}", data);
-//        McException.assertParamException_Null(data, "processInstanceId", "approveResult");
-//        String processInstanceId = data.get("processInstanceId");
-//        return McR.success(hsService.syncApproveResult2Hs(processInstanceId, data.get("approveResult")));
-        return McR.success();
-    }
-
-    /**
-     * 查询钉钉审批结果
-     */
-    @PostMapping("dd/status")
-    McR queryApproveResult(@RequestBody Map<String, List<String>> data) {
-
-        McException.assertParamException_Null(data, "orders");
-        return McR.success(approveRecordDao.findAllByOrderCodeIn(data.get("orders")));
-    }
-
-    /**
-     * 撤销审批中单据
-     */
-    @PostMapping("dd/terminate")
-    McR terminateApproveResult(@RequestBody Map<String, String> data) {
-
-        McException.assertParamException_Null(data, "orderCode", "corpType");
-        HSApproveRecordPo po = approveRecordDao.findByOrderCodeAndApproveResultAndCorpType(data.get("orderCode"), "process", data.get("corpType"));
-        McException.assertAccessException(ObjectUtil.isNull(po), "该单号下, 没有审批中的单据!");
-        ddClient_workflow.terminateRunningApprove(ddClient.getAccessToken(), po.getProcessInstanceId(), true, "环思取消送审", null);
-        approveRecordDao.updateApproveResult(po.getProcessInstanceId(), "terminated", "环思取消送审");
-        po.setApproveResult("terminated");
-        return McR.success(po);
-    }
-
     @Autowired
     private YDClient ydClient;
 
@@ -309,152 +93,151 @@ public class HSController {
         return McR.success(ddr_new);
     }
 
-//    @Qualifier("primaryHJDao")
-//    @Autowired
-//    private HSViewDao hsOrderPlanDao_HJ;
-//
-//    @Qualifier("slaveJTDao")
-//    @Autowired
-//    private com.malk.xintianlong.repository.dao.slave.HSViewDao hsOrderPlanDao_JT;
-//
-//    /**
-//     * 查询生产计划
-//     */
-//    @PostMapping("view/queryOrderPlan")
-//    McR queryOrderPlan(@RequestBody Map data) {
-//
-//        log.info("查询生产计划, {}", data);
-//
-//        String sOrderNo = UtilMap.getString(data, "sOrderNo");
-//        Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
-//
-//        Page page;
-//        double total;
-//        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_HJ.queryOrderPlan(sTime, eTime, sOrderNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryOrderPlan_sum(sTime, eTime, sOrderNo);
-//        } else if (UtilMap.isNotBlankString(data, "startTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            page = hsOrderPlanDao_HJ.queryOrderPlan_start(sTime, sOrderNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryOrderPlan_start_sum(sTime, sOrderNo);
-//        } else if (UtilMap.isNotBlankString(data, "endTime")) {
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_HJ.queryOrderPlan_end(eTime, sOrderNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryOrderPlan_end_sum(eTime, sOrderNo);
-//        } else {
-//            page = hsOrderPlanDao_HJ.queryOrderPlan(sOrderNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryOrderPlan_sum(sOrderNo);
-//        }
-//        Map result = YDR.formatPage(page);
-//        result.put("sum_total", UtilNumber.formatPrecision(total)); // 投入数量合计
-//        return McR.success(BaseDto.jsonFormatDateTime(result));
-//    }
-//
-//    /**
-//     * 查询成品库存
-//     */
-//    @PostMapping("view/queryStoreWarehouse")
-//    McR queryStoreWarehouse(@RequestBody Map data) {
-//
-//        log.info("查询成品库存, {}", data);
-//        String sStoreInNo = UtilMap.getString(data, "sStoreInNo");
-//        Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
-//
-//        Page page;
-//        double total;
-//        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_HJ.queryStoreWarehouse(sTime, eTime, sStoreInNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryStoreWarehouse(sTime, eTime, sStoreInNo);
-//        } else if (UtilMap.isNotBlankString(data, "startTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            page = hsOrderPlanDao_HJ.queryStoreWarehouse_start(sTime, sStoreInNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryStoreWarehouse_start(sTime, sStoreInNo);
-//        } else if (UtilMap.isNotBlankString(data, "endTime")) {
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_HJ.queryStoreWarehouse_end(eTime, sStoreInNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryStoreWarehouse_end(eTime, sStoreInNo);
-//        } else {
-//            page = hsOrderPlanDao_HJ.queryStoreWarehouse(sStoreInNo, pageable);
-//            total = hsOrderPlanDao_HJ.queryStoreWarehouse(sStoreInNo);
-//        }
-//        Map result = YDR.formatPage(page);
-//        result.put("sum_total", UtilNumber.formatPrecision(total * 100)); // 入库数量合计
-//        return McR.success(BaseDto.jsonFormatDateTime(result));
-//    }
-//
-//    /**
-//     * 查询生产计划2
-//     */
-//    @PostMapping("view/queryOrderPlan2")
-//    McR queryOrderPlan2(@RequestBody Map data) {
-//
-//        log.info("查询生产计划2, {}", data);
-//
-//        String sOrderNo = UtilMap.getString(data, "sOrderNo");
-//        Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
-//
-//        Page page;
-//        double total;
-//        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_JT.queryOrderPlan(sTime, eTime, sOrderNo, pageable);
-//            total = hsOrderPlanDao_JT.queryOrderPlan_sum(sTime, eTime, sOrderNo);
-//        } else if (UtilMap.isNotBlankString(data, "startTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            page = hsOrderPlanDao_JT.queryOrderPlan_start(sTime, sOrderNo, pageable);
-//            total = hsOrderPlanDao_JT.queryOrderPlan_start_sum(sTime, sOrderNo);
-//        } else if (UtilMap.isNotBlankString(data, "endTime")) {
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_JT.queryOrderPlan_end(eTime, sOrderNo, pageable);
-//            total = hsOrderPlanDao_JT.queryOrderPlan_end_sum(eTime, sOrderNo);
-//        } else {
-//            page = hsOrderPlanDao_JT.queryOrderPlan(sOrderNo, pageable);
-//            total = hsOrderPlanDao_JT.queryOrderPlan_sum(sOrderNo);
-//        }
-//        Map result = YDR.formatPage(page);
-//        result.put("sum_total", UtilNumber.formatPrecision(total)); // 投入数量合计
-//        return McR.success(BaseDto.jsonFormatDateTime(result));
-//    }
-//
-//    /**
-//     * 查询成品库存
-//     */
-//    @PostMapping("view/queryStoreWarehouse2")
-//    McR queryStoreWarehouse2(@RequestBody Map data) {
-//
-//        log.info("查询成品库存2, {}", data);
-//        String sStoreInNo = UtilMap.getString(data, "sStoreInNo");
-//        Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
-//
-//        Page page;
-//        double total;
-//        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_JT.queryStoreWarehouse(sTime, eTime, sStoreInNo, pageable);
-//            total = hsOrderPlanDao_JT.queryStoreWarehouse(sTime, eTime, sStoreInNo);
-//        } else if (UtilMap.isNotBlankString(data, "startTime")) {
-//            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
-//            page = hsOrderPlanDao_JT.queryStoreWarehouse_start(sTime, sStoreInNo, pageable);
-//            total = hsOrderPlanDao_JT.queryStoreWarehouse_start(sTime, sStoreInNo);
-//        } else if (UtilMap.isNotBlankString(data, "endTime")) {
-//            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
-//            page = hsOrderPlanDao_JT.queryStoreWarehouse_end(eTime, sStoreInNo, pageable);
-//            total = hsOrderPlanDao_JT.queryStoreWarehouse_end(eTime, sStoreInNo);
-//        } else {
-//            page = hsOrderPlanDao_JT.queryStoreWarehouse(sStoreInNo, pageable);
-//            total = hsOrderPlanDao_JT.queryStoreWarehouse(sStoreInNo);
-//        }
-//        Map result = YDR.formatPage(page);
-//        result.put("sum_total", UtilNumber.formatPrecision(total * 100)); // 入库数量合计
-//        return McR.success(BaseDto.jsonFormatDateTime(result));
-//    }
+    @Qualifier("primaryHJDao")
+    @Autowired
+    private HSViewDao hsOrderPlanDao_HJ;
 
+    @Qualifier("slaveJTDao")
+    @Autowired
+    private com.malk.xintianlong.repository.dao.slave.HSViewDao hsOrderPlanDao_JT;
+
+    /**
+     * 查询生产计划
+     */
+    @PostMapping("view/queryOrderPlan")
+    McR queryOrderPlan(@RequestBody Map data) {
+
+        log.info("查询生产计划, {}", data);
+
+        String sOrderNo = UtilMap.getString(data, "sOrderNo");
+        org.springframework.data.domain.Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
+
+        Page page;
+        double total;
+        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_HJ.queryOrderPlan(sTime, eTime, sOrderNo, pageable);
+            total = hsOrderPlanDao_HJ.queryOrderPlan_sum(sTime, eTime, sOrderNo);
+        } else if (UtilMap.isNotBlankString(data, "startTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            page = hsOrderPlanDao_HJ.queryOrderPlan_start(sTime, sOrderNo, pageable);
+            total = hsOrderPlanDao_HJ.queryOrderPlan_start_sum(sTime, sOrderNo);
+        } else if (UtilMap.isNotBlankString(data, "endTime")) {
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_HJ.queryOrderPlan_end(eTime, sOrderNo, pageable);
+            total = hsOrderPlanDao_HJ.queryOrderPlan_end_sum(eTime, sOrderNo);
+        } else {
+            page = hsOrderPlanDao_HJ.queryOrderPlan(sOrderNo, pageable);
+            total = hsOrderPlanDao_HJ.queryOrderPlan_sum(sOrderNo);
+        }
+        Map result = YDR.formatPage(page);
+        result.put("sum_total", UtilNumber.formatPrecisionValue(total)); // 投入数量合计
+        return McR.success(BaseDto.jsonFormatDateTime(result));
+    }
+
+    /**
+     * 查询成品库存
+     */
+    @PostMapping("view/queryStoreWarehouse")
+    McR queryStoreWarehouse(@RequestBody Map data) {
+
+        log.info("查询成品库存, {}", data);
+        String sStoreInNo = UtilMap.getString(data, "sStoreInNo");
+        org.springframework.data.domain.Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
+
+        Page page;
+        double total;
+        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_HJ.queryStoreWarehouse(sTime, eTime, sStoreInNo, pageable);
+            total = hsOrderPlanDao_HJ.queryStoreWarehouse(sTime, eTime, sStoreInNo);
+        } else if (UtilMap.isNotBlankString(data, "startTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            page = hsOrderPlanDao_HJ.queryStoreWarehouse_start(sTime, sStoreInNo, pageable);
+            total = hsOrderPlanDao_HJ.queryStoreWarehouse_start(sTime, sStoreInNo);
+        } else if (UtilMap.isNotBlankString(data, "endTime")) {
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_HJ.queryStoreWarehouse_end(eTime, sStoreInNo, pageable);
+            total = hsOrderPlanDao_HJ.queryStoreWarehouse_end(eTime, sStoreInNo);
+        } else {
+            page = hsOrderPlanDao_HJ.queryStoreWarehouse(sStoreInNo, pageable);
+            total = hsOrderPlanDao_HJ.queryStoreWarehouse(sStoreInNo);
+        }
+        Map result = YDR.formatPage(page);
+        result.put("sum_total", UtilNumber.formatPrecisionValue(total * 100)); // 入库数量合计
+        return McR.success(BaseDto.jsonFormatDateTime(result));
+    }
+
+    /**
+     * 查询生产计划2
+     */
+    @PostMapping("view/queryOrderPlan2")
+    McR queryOrderPlan2(@RequestBody Map data) {
+
+        log.info("查询生产计划2, {}", data);
+
+        String sOrderNo = UtilMap.getString(data, "sOrderNo");
+        org.springframework.data.domain.Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
+
+        Page page;
+        double total;
+        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_JT.queryOrderPlan(sTime, eTime, sOrderNo, pageable);
+            total = hsOrderPlanDao_JT.queryOrderPlan_sum(sTime, eTime, sOrderNo);
+        } else if (UtilMap.isNotBlankString(data, "startTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            page = hsOrderPlanDao_JT.queryOrderPlan_start(sTime, sOrderNo, pageable);
+            total = hsOrderPlanDao_JT.queryOrderPlan_start_sum(sTime, sOrderNo);
+        } else if (UtilMap.isNotBlankString(data, "endTime")) {
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_JT.queryOrderPlan_end(eTime, sOrderNo, pageable);
+            total = hsOrderPlanDao_JT.queryOrderPlan_end_sum(eTime, sOrderNo);
+        } else {
+            page = hsOrderPlanDao_JT.queryOrderPlan(sOrderNo, pageable);
+            total = hsOrderPlanDao_JT.queryOrderPlan_sum(sOrderNo);
+        }
+        Map result = YDR.formatPage(page);
+        result.put("sum_total", UtilNumber.formatPrecisionValue(total)); // 投入数量合计
+        return McR.success(BaseDto.jsonFormatDateTime(result));
+    }
+
+    /**
+     * 查询成品库存
+     */
+    @PostMapping("view/queryStoreWarehouse2")
+    McR queryStoreWarehouse2(@RequestBody Map data) {
+
+        log.info("查询成品库存2, {}", data);
+        String sStoreInNo = UtilMap.getString(data, "sStoreInNo");
+        Pageable pageable = PageRequest.of(UtilMap.getInt(data, "page") - 1, UtilMap.getInt(data, "size"));
+
+        Page page;
+        double total;
+        if (UtilMap.isNotBlankString(data, "startTime") && UtilMap.isNotBlankString(data, "endTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_JT.queryStoreWarehouse(sTime, eTime, sStoreInNo, pageable);
+            total = hsOrderPlanDao_JT.queryStoreWarehouse(sTime, eTime, sStoreInNo);
+        } else if (UtilMap.isNotBlankString(data, "startTime")) {
+            Date sTime = new Date(UtilMap.getLong(data, "startTime"));
+            page = hsOrderPlanDao_JT.queryStoreWarehouse_start(sTime, sStoreInNo, pageable);
+            total = hsOrderPlanDao_JT.queryStoreWarehouse_start(sTime, sStoreInNo);
+        } else if (UtilMap.isNotBlankString(data, "endTime")) {
+            Date eTime = new Date(UtilMap.getLong(data, "endTime"));
+            page = hsOrderPlanDao_JT.queryStoreWarehouse_end(eTime, sStoreInNo, pageable);
+            total = hsOrderPlanDao_JT.queryStoreWarehouse_end(eTime, sStoreInNo);
+        } else {
+            page = hsOrderPlanDao_JT.queryStoreWarehouse(sStoreInNo, pageable);
+            total = hsOrderPlanDao_JT.queryStoreWarehouse(sStoreInNo);
+        }
+        Map result = YDR.formatPage(page);
+        result.put("sum_total", UtilNumber.formatPrecisionValue(total * 100)); // 入库数量合计
+        return McR.success(BaseDto.jsonFormatDateTime(result));
+    }
 
     @PostMapping("test")
     McR test() {

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

@@ -0,0 +1,264 @@
+package com.malk.xintianlong.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.malk.Util.UtilMap;
+import com.malk.server.common.McException;
+import com.malk.server.common.McR;
+import com.malk.server.dingtalk.DDConf;
+import com.malk.server.dingtalk.DDFormComponentDto;
+import com.malk.service.dingtalk.DDClient;
+import com.malk.service.dingtalk.DDClient_Workflow;
+import com.malk.xintianlong.repository.dao.primary.HSApproveRecordDao;
+import com.malk.xintianlong.repository.entity.primary.HSApproveRecordPo;
+import com.malk.xintianlong.server.HSConf;
+import com.malk.xintianlong.service.HSService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 错误抛出与拦截详见CatchException
+ */
+@Slf4j
+@RestController
+@RequestMapping
+public class JCController {
+
+        @Autowired
+        private DDClient ddClient;
+
+        @Autowired
+        private DDClient_Workflow ddClient_workflow;
+
+        @Autowired
+        private HSApproveRecordDao approveRecordDao;
+
+        @Autowired
+        private HSService hsService;
+
+        /**
+         * 市场布结算单审批
+         */
+        @PostMapping("dd/scb-jsd")
+        McR marketApprove(@RequestBody Map data, HttpServletRequest request) {
+
+            log.info("市场布结算单审批, {}", data);
+            data.put("corpType", "01"); // prd 市场布, 只有金塔的
+            hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
+
+            // 组件数据格式化
+            data.put("salesmanCodeDing", JSON.toJSONString(Arrays.asList(data.get("salesmanCode"))));
+            Map ruleForm = UtilMap.map("orderCode, proposerDate, salesmanCodeDing", "结算单号, 出货日期, 业务员");
+            ruleForm.put("taskCode", "指定书号");
+            ruleForm.put("purchaseCorp", "要货单位");
+            ruleForm.put("productiionName", "产品编码");
+            ruleForm.put("transportationCode", "调运单号");
+            ruleForm.put("totalPrice", "实收加工费(元)");
+
+            Map ruleDetail = UtilMap.map("casting", UtilMap.map("taskCode, size, count, supplier, remark", "指定书号, 品名/规格, 数量, 供应商, 备注"));
+            ruleForm.put("casting", "市场布坯布详情");
+
+            ruleDetail.put("shipment", UtilMap.map("taskCode, constructCode, size, color, num, count, price, total, remark", "指定书号, 合同号, 品名/规格, 颜色, 件数, 数量, 单价, 金额（元）, 备注"));
+            ruleForm.put("shipment", "市场布成品详情");
+
+            // 推送钉钉审批
+            List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, ruleDetail);
+
+            String userId = String.valueOf(data.get("proposerCode"));
+            Map extInfo = UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT);
+            String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, HSConf.MARKET_CODE_DD, formValues, extInfo);
+
+            // 保存推送记录
+            HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
+            po.setProcessInstanceId(processInstanceId);
+            po.setRemark("市场布结算单");
+            po.setFormType("TM001");
+            approveRecordDao.save(po);
+
+            return McR.success(po);
+        }
+
+        /**
+         * 推送申购单审批
+         */
+        @PostMapping("dd/sgd")
+        McR purchaseApprove(@RequestBody Map data, HttpServletRequest request) {
+
+            log.info("推送申购单审批, {}", data);
+            hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
+
+            // 组件数据格式化
+            data.put("corpTypeName", HSConf.SUB_CORP_DD.get(data.get("corpType")));
+            Map ruleForm = UtilMap.map("corpTypeName, orderCode, proposerDate, purchaseType, department, category, goods", "公司主体, 请购单号, 请购日期, 采购类型, 申请部门, 采购项目, 采购明细");
+            Map ruleDetail = UtilMap.map("name, size, num, remark, price, supplier", "物品名称, 规格, 数量, 备注, 最近入库单价（元/吨）, 供应商");
+
+            // 推送钉钉审批
+            List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, ruleDetail);
+            String userId = String.valueOf(data.get("proposerCode"));
+            Map extInfo = UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT);
+            String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, HSConf.PURCHASE_CODE_DD, formValues, extInfo);
+
+            // 保存推送记录
+            HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
+            po.setProcessInstanceId(processInstanceId);
+            po.setRemark("采购申请单");
+            po.setFormType("PU001");
+            approveRecordDao.save(po);
+
+            return McR.success(po);
+        }
+
+        /**
+         * 推送结算单审批
+         */
+        @PostMapping("dd/jsd")
+        McR settleApprove(@RequestBody Map data, HttpServletRequest request) {
+
+            log.info("推送结算单审批, {}", data);
+            hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
+
+            // 组件数据格式化
+            data.put("corpTypeName", HSConf.SUB_CORP_DD.get(data.get("corpType")));
+            data.put("salesmanCodeDing", JSON.toJSONString(Arrays.asList(data.get("salesmanCode"))));
+            if (StringUtils.isNotBlank(String.valueOf(data.get("transportationCode2")))) {
+                data.put("transportationCode", data.get("transportationCode") + "/" + data.get("transportationCode2"));
+            }
+            if (StringUtils.isNotBlank(String.valueOf(data.get("proposerDate2")))) {
+                data.put("proposerDate", data.get("proposerDate") + "/" + data.get("proposerDate2"));
+            }
+            Map ruleForm = UtilMap.map("corpTypeName, orderCode, proposerDate, salesmanCodeDing", "所属公司, 结算单号, 出货日期, 业务员");
+            ruleForm.put("taskCode", "指定书号");
+            ruleForm.put("purchaseCorp", "要货单位");
+            ruleForm.put("invoiceNumber", "发票号");
+            ruleForm.put("productiionName", "产品名称");
+            ruleForm.put("transportationCode", "调运单号");
+            ruleForm.put("processingCharges", "加工费详情");
+            ruleForm.put("totalPrice", "实收加工费(元)");
+
+            Map ruleDetail = UtilMap.map("casting", UtilMap.map("taskCode, groupCode, size, count, price, total, supplier, remark", "指定书号, 组号, 品名/规格, 数量(米), 单价, 金额（元）, 供坯商, 备注"));
+            ruleForm.put("casting", "投坯详情");
+
+            ruleDetail.put("shipment", UtilMap.map("taskCode, groupCode, constructCode, size, num, count, price, total, priceSpread, remark", "指定书号, 组号, 合同号, 品名/规格, 件数, 数量(米), 单价, 金额（元）, 辅料差价(元), 备注"));
+            ruleForm.put("shipment", "成品出货详情");
+
+            ruleDetail.put("residue", UtilMap.map("taskCode, groupCode, size, num, count, price, total, otherPrice, remark", "指定书号, 组号, 品名/规格, 件数, 数量(米), 单价, 金额（元）, 其他金额(元), 备注"));
+            ruleForm.put("residue", "余坯款");
+
+            // 推送钉钉审批
+            List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, ruleDetail);
+
+            String userId = String.valueOf(data.get("proposerCode"));
+            Map extInfo = UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT);
+            String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, HSConf.SETTLE_CODE_DD, formValues, extInfo);
+
+            // 保存推送记录
+            HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
+            po.setProcessInstanceId(processInstanceId);
+            po.setRemark("结算申请单");
+            po.setFormType("TS001");
+            approveRecordDao.save(po);
+
+            return McR.success(po);
+        }
+
+        /**
+         * 推送指定书审批
+         */
+        @PostMapping("dd/zds")
+        McR assignmentLetter(@RequestBody Map data, HttpServletRequest request) {
+
+            data.put("test", "是");
+            log.info("推送指定书审批, {}", data);
+            hsService.validateAuthorization(request, String.valueOf(data.get("orderCode")), String.valueOf(data.get("corpType")));
+
+            // 组件数据格式化
+            String userId = String.valueOf(data.get("proposerCode"));
+            String orderCode = String.valueOf(data.get("orderCode"));
+            data.put("corpTypeName", HSConf.SUB_CORP_DD.get(data.get("corpType")));
+            data.put("proposerCodeDing", JSON.toJSONString(Arrays.asList(userId)));
+            data.put("salesmanCodeDing", JSON.toJSONString(Arrays.asList(data.get("salesmanCode"))));
+            Map detry = ddClient.uploadFileFormUrl(ddClient.getAccessToken(), userId, HSConf.getAttachmentUrl(orderCode, String.valueOf(data.get("corpType"))), orderCode);
+            data.put("attachmentId", DDFormComponentDto.formatAttachment(detry));
+
+            // 推送钉钉审批
+            Map ruleForm = UtilMap.map("corpTypeName, orderCode, proposerCodeDing, proposerDate, consignee, salesmanCodeDing, attachmentId, test", "公司主体, 指定书号, 制单人, 制单日期, 要货单位, 业务员, 附件, 单选框");
+            List<Map> formValues = DDFormComponentDto.formatComponentValues(data, ruleForm, null);
+            String processInstanceId = ddClient_workflow.doProcessInstances(ddClient.getAccessToken(), userId, "PROC-BEA7B05C-1BFD-4194-A241-354611378D74", formValues, UtilMap.map("dept_id", DDConf.TOP_DEPARTMENT));
+
+            // 保存推送记录
+            HSApproveRecordPo po = JSON.parseObject(JSON.toJSONString(data), HSApproveRecordPo.class);
+            po.setProcessInstanceId(processInstanceId);
+            po.setRemark("生产任务指定书");
+            po.setFormType("SD001");
+            approveRecordDao.save(po);
+
+            return McR.success(po);
+        }
+
+        @Autowired
+        HSApproveRecordDao hsApproveRecordDao;
+
+        /**
+         * 钉钉审批回调 [连接器-同意] - 废弃
+         */
+//    @PostMapping("dd/approve")
+        McR purchaseApproveCallback(@RequestBody Map<String, String> data) {
+
+            log.info("###### [HS]开始同步审批中记录 ######");
+            List<HSApproveRecordPo> list = hsApproveRecordDao.findAllByApproveResult("process");
+            log.info("同步数量, {}", list.size());
+            for (HSApproveRecordPo po : list) {
+                Map rsp = ddClient_workflow.getProcessInstanceId(ddClient.getAccessToken(), po.getProcessInstanceId());
+                if (Arrays.asList("RUNNING", "NEW").contains(rsp.get("status"))) {
+                    continue;
+                }
+                if (Arrays.asList("TERMINATED", "CANCELED").contains(rsp.get("status"))) {
+                    hsService.syncApproveResult2Hs(po.getProcessInstanceId(), "terminated");
+                }
+                if (StringUtils.isNotBlank(String.valueOf(rsp.get("result")))) {
+                    hsService.syncApproveResult2Hs(po.getProcessInstanceId(), "agree".equals(String.valueOf(rsp.get("result"))) ? "agree" : "refuse");
+                }
+            }
+//        log.info("申购单审批回调, {}", data);
+//        McException.assertParamException_Null(data, "processInstanceId", "approveResult");
+//        String processInstanceId = data.get("processInstanceId");
+//        return McR.success(hsService.syncApproveResult2Hs(processInstanceId, data.get("approveResult")));
+            return McR.success();
+        }
+
+        /**
+         * 查询钉钉审批结果
+         */
+        @PostMapping("dd/status")
+        McR queryApproveResult(@RequestBody Map<String, List<String>> data) {
+
+            McException.assertParamException_Null(data, "orders");
+            return McR.success(approveRecordDao.findAllByOrderCodeIn(data.get("orders")));
+        }
+
+        /**
+         * 撤销审批中单据
+         */
+        @PostMapping("dd/terminate")
+        McR terminateApproveResult(@RequestBody Map<String, String> data) {
+
+            McException.assertParamException_Null(data, "orderCode", "corpType");
+            HSApproveRecordPo po = approveRecordDao.findByOrderCodeAndApproveResultAndCorpType(data.get("orderCode"), "process", data.get("corpType"));
+            McException.assertAccessException(ObjectUtil.isNull(po), "该单号下, 没有审批中的单据!");
+            ddClient_workflow.terminateRunningApprove(ddClient.getAccessToken(), po.getProcessInstanceId(), true, "环思取消送审", null);
+            approveRecordDao.updateApproveResult(po.getProcessInstanceId(), "terminated", "环思取消送审");
+            po.setApproveResult("terminated");
+            return McR.success(po);
+        }
+    }
+

mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/primary/HSViewDao.java

@@ -1,79 +1,79 @@
-//package com.malk.xintianlong.repository.dao.primary;
-//
-//import com.malk.base.JpaMap;
-//import org.springframework.data.domain.Page;
-//import org.springframework.data.domain.Pageable;
-//import org.springframework.data.jpa.repository.Query;
-//import org.springframework.data.repository.CrudRepository;
-//import org.springframework.stereotype.Repository;
-//
-//import javax.transaction.Transactional;
-//import java.util.Date;
-//import java.util.Map;
-//
-///**
-// * 视图表查询 [通过Map实现, 无需定义实体, 主键设置Long即可]
-// */
-//@Repository("primaryHJDao")
-//@Transactional
-//public interface HSViewDao extends CrudRepository<JpaMap, Long> {
-//    /**
-//     * 查询生产计划
-//     */
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan(Date start, Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan_start(Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan_end(Date start, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan(String sOrderNo, Pageable pageable);
-//
-//    /**
-//     * 查询生产计划_数量
-//     */
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
-//    double queryOrderPlan_sum(Date start, Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryOrderPlan_start_sum(Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryOrderPlan_end_sum(Date start, String sOrderNo);
-//
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
-//    double queryOrderPlan_sum(String sOrderNo);
-//
-//    /**
-//     * 查询成品库存
-//     */
-//    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse(Date start, Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse_start(Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse_end(Date start, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse(String sStoreInNo, Pageable pageable);
-//
-//    /**
-//     * 查询成品库存_数量
-//     */
-//    @Query(value = "select sum(nInQty) from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse(Date start, Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse_start(Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse_end(Date start, String sOrderNo);
-//
-//    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse(String sStoreInNo);
-//}
+package com.malk.xintianlong.repository.dao.primary;
+
+import com.malk.base.JpaMap;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import javax.transaction.Transactional;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 视图表查询 [通过Map实现, 无需定义实体, 主键设置Long即可]
+ */
+@Repository("primaryHJDao")
+@Transactional
+public interface HSViewDao extends CrudRepository<JpaMap, Long> {
+    /**
+     * 查询生产计划
+     */
+    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan(Date start, Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan_start(Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan_end(Date start, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan(String sOrderNo, Pageable pageable);
+
+    /**
+     * 查询生产计划_数量
+     */
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
+    double queryOrderPlan_sum(Date start, Date end, String sOrderNo);
+
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryOrderPlan_start_sum(Date end, String sOrderNo);
+
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryOrderPlan_end_sum(Date start, String sOrderNo);
+
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
+    double queryOrderPlan_sum(String sOrderNo);
+
+    /**
+     * 查询成品库存
+     */
+    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse(Date start, Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse_start(Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse_end(Date start, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse(String sStoreInNo, Pageable pageable);
+
+    /**
+     * 查询成品库存_数量
+     */
+    @Query(value = "select sum(nInQty) from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
+    double queryStoreWarehouse(Date start, Date end, String sOrderNo);
+
+    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryStoreWarehouse_start(Date end, String sOrderNo);
+
+    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryStoreWarehouse_end(Date start, String sOrderNo);
+
+    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
+    double queryStoreWarehouse(String sStoreInNo);
+}

mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/slave/HSViewDao.java

@@ -1,80 +1,80 @@
-//package com.malk.xintianlong.repository.dao.slave;
-//
-//import com.malk.repository.entity.slave.JpaMapSlave;
-//import org.springframework.data.domain.Page;
-//import org.springframework.data.domain.Pageable;
-//import org.springframework.data.jpa.repository.Query;
-//import org.springframework.data.repository.CrudRepository;
-//import org.springframework.stereotype.Repository;
-//
-//import javax.transaction.Transactional;
-//import java.util.Date;
-//import java.util.Map;
-//
-///**
-// * 视图表查询 [通过Map实现, 无需定义实体, 主键设置Long即可]
-// */
-//@Repository("slaveJTDao")
-//@Transactional
-//public interface HSViewDao extends CrudRepository<JpaMapSlave, Long> {
-//
-//    /**
-//     * 查询生产计划
-//     */
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan(Date start, Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan_start(Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan_end(Date start, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%') order by dPlanDate desc", nativeQuery = true)
-//    Page<Map> queryOrderPlan(String sOrderNo, Pageable pageable);
-//
-//    /**
-//     * 查询生产计划_数量
-//     */
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
-//    double queryOrderPlan_sum(Date start, Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryOrderPlan_start_sum(Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryOrderPlan_end_sum(Date start, String sOrderNo);
-//
-//    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
-//    double queryOrderPlan_sum(String sOrderNo);
-//
-//    /**
-//     * 查询成品库存
-//     */
-//    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse(Date start, Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse_start(Date end, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse_end(Date start, String sOrderNo, Pageable pageable);
-//
-//    @Query(value = "select * from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%') order by tStoreInTime desc", nativeQuery = true)
-//    Page<Map> queryStoreWarehouse(String sStoreInNo, Pageable pageable);
-//
-//    /**
-//     * 查询成品库存_数量
-//     */
-//    @Query(value = "select sum(nInQty) from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse(Date start, Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse_start(Date end, String sOrderNo);
-//
-//    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse_end(Date start, String sOrderNo);
-//
-//    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
-//    double queryStoreWarehouse(String sStoreInNo);
-//}
+package com.malk.xintianlong.repository.dao.slave;
+
+import com.malk.repository.entity.slave.JpaMapSlave;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import javax.transaction.Transactional;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 视图表查询 [通过Map实现, 无需定义实体, 主键设置Long即可]
+ */
+@Repository("slaveJTDao")
+@Transactional
+public interface HSViewDao extends CrudRepository<JpaMapSlave, Long> {
+
+    /**
+     * 查询生产计划
+     */
+    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan(Date start, Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan_start(Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan_end(Date start, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%') order by dPlanDate desc", nativeQuery = true)
+    Page<Map> queryOrderPlan(String sOrderNo, Pageable pageable);
+
+    /**
+     * 查询生产计划_数量
+     */
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and dPlanDate <= ?2 and sOrderNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
+    double queryOrderPlan_sum(Date start, Date end, String sOrderNo);
+
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate >= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryOrderPlan_start_sum(Date end, String sOrderNo);
+
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where dPlanDate <= ?1 and sOrderNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryOrderPlan_end_sum(Date start, String sOrderNo);
+
+    @Query(value = "select sum(trnQty) from vwpbCommonDataOrderPlan where sOrderNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
+    double queryOrderPlan_sum(String sOrderNo);
+
+    /**
+     * 查询成品库存
+     */
+    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse(Date start, Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse_start(Date end, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse_end(Date start, String sOrderNo, Pageable pageable);
+
+    @Query(value = "select * from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%') order by tStoreInTime desc", nativeQuery = true)
+    Page<Map> queryStoreWarehouse(String sStoreInNo, Pageable pageable);
+
+    /**
+     * 查询成品库存_数量
+     */
+    @Query(value = "select sum(nInQty) from vwmmSTInStoreQuery where tStoreInTime >= ?1 and tStoreInTime <= ?2 and sStoreInNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
+    double queryStoreWarehouse(Date start, Date end, String sOrderNo);
+
+    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime >= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryStoreWarehouse_start(Date end, String sOrderNo);
+
+    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where tStoreInTime <= ?1 and sStoreInNo like LTRIM('%' + ?2 + '%')", nativeQuery = true)
+    double queryStoreWarehouse_end(Date start, String sOrderNo);
+
+    @Query(value = "select sum(nInQty)  from vwmmSTInStoreQuery where sStoreInNo like LTRIM('%' + ?1 + '%')", nativeQuery = true)
+    double queryStoreWarehouse(String sStoreInNo);
+}

mjava-xintianlong/src/main/resources/application-dev.yml

@@ -7,48 +7,49 @@ server:
 # condition
 spel:
   scheduling: false        # 定时任务是否执行
-  multiSource: false        # 是否多数据源配置
+  multiSource: true        # 是否多数据源配置 -- 订单查询
 
 spring:
-  # database
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
-  jpa:
-    hibernate:
-      ddl-auto: none      # JPA对表没有任何操作
-    show-sql: true
-    database: MYSQL
-    database-platform: org.hibernate.dialect.MySQLDialect
+#  # database
 #  datasource:
-#    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
-#    username: dingding
-#    password: dd12345678
-#    # 灏宇
-#    primary:
-#      username: dingding
-#      password: dd12345678
-#      jdbc-url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
-#    # 金塔
-#    slave:
-#      username: dingding
-#      password: dd12345678
-#      jdbc-url: jdbc:sqlserver://122.224.41.74:4336;SelectMethod=cursor;DatabaseName=HSDyeingERP
-#  # JPA
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    username: root
+#    password: cp-root@2022++
+#    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
 #  jpa:
-#    database: sql_server
-#    properties:
-#      hibernate:
-#        default_schema: dbo
 #    hibernate:
-#      ddl-auto: none
-#      naming:
-#        # 取消小驼峰到下划线映射
-#        implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
-#        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+#      ddl-auto: none      # JPA对表没有任何操作
+#    show-sql: true
+#    database: MYSQL
+#    database-platform: org.hibernate.dialect.MySQLDialect
+  # sql_server
+  datasource:
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
+    username: HYKJ
+    password: XTL527204628#123
+    # 灏宇
+    primary:
+      username: HYKJ
+      password: XTL527204628#123
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
+    # 金塔
+    slave:
+      username: JTKS
+      password: XTL527204628@
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4336;SelectMethod=cursor;DatabaseName=HSDyeingERP
+  # JPA
+  jpa:
+    database: sql_server
+    properties:
+      hibernate:
+        default_schema: dbo
+    hibernate:
+      ddl-auto: none
+      naming:
+        # 取消小驼峰到下划线映射
+        implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 
 # filepath
 file:

mjava-xintianlong/src/main/resources/application-prod.yml

@@ -1,63 +1,64 @@
 # 环境配置
 server:
-  port: 9005
+  port: 9001 # -- 订单查询
+#  port: 9005 # -- 审批推送
   servlet:
     context-path: /api/xintianlong
 
 # condition
 spel:
-  scheduling: true       # 定时任务是否执行
-  multiSource: false       # 是否多数据源配置
+  scheduling: false       # 定时任务是否执行
+  multiSource: true      # 是否多数据源配置 -- 订单查询
 
 spring:
-  # database
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: cp-root@2022++
-    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
-  jpa:
-    database: MYSQL
-    database-platform: org.hibernate.dialect.MySQL57Dialect
-  # 数据库版本
-  flyway:
-    enabled: false                      #  需要配置 jpa.hibernate.ddl-auto 为 none. 否则 flyway.enabled 配置会无效, 在没有数库连接情况下程序无法启动
-    encoding: UTF-8
-    locations: classpath:db/migration   # 迁移sql脚本文件存放路径，默认db/migration
-    sql-migration-prefix: V             # 迁移sql脚本文件名称的前缀，默认V
-    sql-migration-separator: __         # 迁移sql脚本文件名称的分隔符，默认2个下划线__
-    sql-migration-suffixes: .sql        # 迁移sql脚本文件名称的后缀
-    validate-on-migrate: true           # 迁移时是否进行校验，默认true
-    baseline-on-migrate: true           # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
+#  # database
+#  datasource:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    username: root
+#    password: cp-root@2022++
+#    url: jdbc:mysql://47.110.74.198:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+#  jpa:
+#    database: MYSQL
+#    database-platform: org.hibernate.dialect.MySQL57Dialect
+#  # 数据库版本
+#  flyway:
+#    enabled: false                      #  需要配置 jpa.hibernate.ddl-auto 为 none. 否则 flyway.enabled 配置会无效, 在没有数库连接情况下程序无法启动
+#    encoding: UTF-8
+#    locations: classpath:db/migration   # 迁移sql脚本文件存放路径，默认db/migration
+#    sql-migration-prefix: V             # 迁移sql脚本文件名称的前缀，默认V
+#    sql-migration-separator: __         # 迁移sql脚本文件名称的分隔符，默认2个下划线__
+#    sql-migration-suffixes: .sql        # 迁移sql脚本文件名称的后缀
+#    validate-on-migrate: true           # 迁移时是否进行校验，默认true
+#    baseline-on-migrate: true           # 当迁移发现数据库非空且存在没有元数据的表时，自动执行基准迁移，新建schema_version表
 
   # sql_server
-#  datasource:
-#    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
-#    username: dingding
-#    password: dd12345678
-#    # 灏宇
-#    primary:
-#      username: dingding
-#      password: dd12345678
-#      jdbc-url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
-#    # 金塔
-#    slave:
-#      username: dingding
-#      password: dd12345678
-#      jdbc-url: jdbc:sqlserver://122.224.41.74:4336;SelectMethod=cursor;DatabaseName=HSDyeingERP
-#    # JPA
-#    jpa:
-#      database: sql_server
-#      properties:
-#        hibernate:
-#          default_schema: dbo
-#      hibernate:
-#        ddl-auto: none
-#        naming:
-#          # 取消小驼峰到下划线映射
-#          implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
-#          physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+  datasource:
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
+    username: HYKJ
+    password: XTL527204628#123
+    # 灏宇
+    primary:
+      username: HYKJ
+      password: XTL527204628#123
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4335;SelectMethod=cursor;DatabaseName=HSDyeingERP
+    # 金塔
+    slave:
+      username: JTKS
+      password: XTL527204628@
+      jdbc-url: jdbc:sqlserver://122.224.41.74:4336;SelectMethod=cursor;DatabaseName=HSDyeingERP
+  # JPA
+  jpa:
+    database: sql_server
+    properties:
+      hibernate:
+        default_schema: dbo
+    hibernate:
+      ddl-auto: none
+      naming:
+        # 取消小驼峰到下划线映射
+        implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 
 # dingtalk
 dingtalk:

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

@@ -1,62 +0,0 @@
-package com.malk.xintianlong.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;
-
-
-/**
- * QHSApproveRecordPo is a Querydsl query type for HSApproveRecordPo
- */
-@Generated("com.querydsl.codegen.EntitySerializer")
-public class QHSApproveRecordPo extends EntityPathBase<HSApproveRecordPo> {
-
-    private static final long serialVersionUID = -856519298L;
-
-    public static final QHSApproveRecordPo hSApproveRecordPo = new QHSApproveRecordPo("hSApproveRecordPo");
-
-    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
-
-    public final StringPath approveResult = createString("approveResult");
-
-    public final StringPath corpType = createString("corpType");
-
-    //inherited
-    public final DateTimePath<java.util.Date> createTime = _super.createTime;
-
-    public final StringPath formType = createString("formType");
-
-    public final StringPath hsResponse = createString("hsResponse");
-
-    //inherited
-    public final NumberPath<Long> id = _super.id;
-
-    public final StringPath orderCode = createString("orderCode");
-
-    public final StringPath processInstanceId = createString("processInstanceId");
-
-    public final StringPath proposerCode = createString("proposerCode");
-
-    public final StringPath remark = createString("remark");
-
-    //inherited
-    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
-
-    public QHSApproveRecordPo(String variable) {
-        super(HSApproveRecordPo.class, forVariable(variable));
-    }
-
-    public QHSApproveRecordPo(Path<? extends HSApproveRecordPo> path) {
-        super(path.getType(), path.getMetadata());
-    }
-
-    public QHSApproveRecordPo(PathMetadata metadata) {
-        super(HSApproveRecordPo.class, metadata);
-    }
-
-}
-

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

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Aug 18 19:10:53 CST 2025
-version=1.0-SNAPSHOT
-groupId=com.malk
-artifactId=mjava-xintianlong

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

@@ -1,12 +0,0 @@
-com/malk/xintianlong/repository/entity/primary/HSApproveRecordPo.class
-com/malk/xintianlong/service/HSService.class
-com/malk/xintianlong/controller/HSController.class
-com/malk/xintianlong/schedule/HSScheduleTask.class
-com/malk/xintianlong/server/HSConf.class
-com/malk/xintianlong/delegate/DDDelegate.class
-com/malk/xintianlong/repository/entity/primary/HSApproveRecordPo$HSApproveRecordPoBuilder.class
-com/malk/xintianlong/repository/entity/primary/QHSApproveRecordPo.class
-com/malk/xintianlong/service/impl/HSServiceImpl.class
-com/malk/xintianlong/Boot.class
-com/malk/xintianlong/controller/DDController.class
-com/malk/xintianlong/repository/dao/primary/HSApproveRecordDao.class

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

@@ -1,13 +0,0 @@
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/primary/HSApproveRecordDao.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/Boot.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/target/generated-sources/java/com/malk/xintianlong/repository/entity/primary/QHSApproveRecordPo.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/controller/HSController.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/delegate/DDDelegate.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/schedule/HSScheduleTask.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/server/HSConf.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/entity/primary/HSApproveRecordPo.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/primary/HSViewDao.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/controller/DDController.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/service/impl/HSServiceImpl.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/repository/dao/slave/HSViewDao.java
-/Users/malk/server/java-mcli-2/mjava-xintianlong/src/main/java/com/malk/xintianlong/service/HSService.java

mjava/src/test/resources/frp/hpe/frpc.ini

@@ -1,6 +1,6 @@
 # frpc.ini
 [common]
-server_addr = 47.97.181.40
+server_addr = 47.110.74.198
 server_port = 1001
 token = NHDDSAISHDHDSDSIODHDASHDJASK=
 

mjava/src/test/resources/frp/macos/frpc.ini

@@ -1,6 +1,6 @@
 # frpc.ini
 [common]
-server_addr = 47.97.181.40
+server_addr = 47.110.74.198
 server_port = 1001
 token = NHDDSAISHDHDSDSIODHDASHDJASK=
 

mjava/src/test/resources/frp/remark.md

@@ -52,7 +52,7 @@
    ./frpc -c ./frpc.ini
    ```
 
-5. 通过 **http** 访问 dashboard：`http://47.97.181.40:1002/static/#/proxies/tcp`
+5. 通过 **http** 访问 dashboard：`http://47.110.74.198:1002/static/#/proxies/tcp`
 
 
 6. 客户端可通过 sh 快速执行启动 【**frpc.sh**】

mjava/target/maven-archiver/pom.properties

@@ -1,5 +1,3 @@
-#Generated by Maven
-#Fri Jun 07 00:41:09 CST 2024
-version=1.0-SNAPSHOT
-groupId=com.malk
 artifactId=mjava
+groupId=com.malk
+version=1.0-SNAPSHOT

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

@@ -1,142 +1,5 @@
-com/malk/test/RESTFulTestController.class
-com/malk/Util/UtilImport$ExecuteLambda.class
-com/malk/server/aliwork/YDParam$Retrieve_Condition.class
-com/malk/service/fxiaoke/impl/FXKImplClient.class
-com/malk/server/h3yun/CYConf.class
-com/malk/service/dingtalk/DDClient_Storage.class
-com/malk/service/dingtalk/DDClient_Attendance.class
-com/malk/Util/UtilMc.class
-com/malk/Filter/RequestInterceptor.class
-com/malk/service/aliyun/impl/ALYInvoiceImpl.class
-com/malk/Util/UtilMath.class
-com/malk/delegate/McDelegate.class
-com/malk/server/aliwork/YDParam$Retrieve_FormInstId.class
-com/malk/Util/UtilImport$UtilImportBuilder.class
-com/malk/server/aliwork/YDParam$Delete.class
-com/malk/server/common/McException$McExceptionBuilder.class
-com/malk/Util/UtilDateTime.class
-com/malk/config/mutilSource/SlaveConfig.class
-com/malk/server/aliwork/YDR.class
-com/malk/service/dingtalk/impl/DDImplClient.class
-com/malk/repository/entity/primary/McTablePo$McTablePoBuilder.class
-com/malk/server/aliwork/YDConf.class
-com/malk/service/dingtalk/impl/DDImplClient_Storage.class
-com/malk/server/ekuaibao/EKBR.class
-com/malk/Util/UtilFile.class
-com/malk/repository/entity/primary/McTablePo.class
 com/malk/base/QBasePo.class
-com/malk/server/dingtalk/DDR_New.class
-com/malk/service/tencent/impl/TXYImplInvoice.class
-com/malk/server/tencent/TXYConf.class
-com/malk/server/h3yun/CYConf$ACTION_NAME.class
-com/malk/service/xbongbong/impl/XBBImplClient.class
-com/malk/test/McTestController$TModel.class
-com/malk/base/BaseDto.class
-com/malk/config/WebConfiguration.class
-com/malk/Util/UtilServlet.class
-com/malk/Util/UtilHttp.class
-com/malk/service/ekuaibao/impl/EKBClientImpl.class
-com/malk/server/common/McConf.class
-com/malk/Util/UtilString.class
-com/malk/Util/UtilVendor.class
-com/malk/server/aliwork/YDConf$FORM_OPERATION.class
-com/malk/delegate/impl/DDImplEvent_Delegate.class
-com/malk/service/dingtalk/impl/DDImplClient_Contacts.class
-com/malk/server/aliwork/YDParam$Create_Process.class
-com/malk/service/ekuaibao/EKBClient.class
-com/malk/service/dingtalk/DDClient_Workflow.class
-META-INF/spring-configuration-metadata.json
-com/malk/controller/DDCallbackController.class
-com/malk/Boot.class
-com/malk/test/dto/Async2Sync.class
-com/malk/Util/UtilExcel.class
-com/malk/base/BaseRepository.class
-com/malk/repository/entity/slave/JpaMapSlave.class
-com/malk/config/mutilSource/DataSourceConfig.class
-com/malk/service/dingtalk/DDService.class
-com/malk/server/common/FilePath$Path.class
-com/malk/server/dingtalk/DDConf.class
-com/malk/server/h3yun/CYR.class
-com/malk/Util/UtilExcel$UpdateCellStyle.class
-com/malk/Util/UtilExcel$UtilExcelBuilder.class
-com/malk/server/common/McPage.class
-com/malk/Filter/RequestFilter.class
-com/malk/service/fxiaoke/FXKClient.class
-com/malk/server/dingtalk/crypto/DingCallbackCrypto$Utils.class
-com/malk/service/h3yun/impl/CYImplClient.class
-com/malk/service/aliyun/ALYInvoice.class
-com/malk/service/aliwork/impl/YDClientImpl.class
-com/malk/server/common/McR.class
-com/malk/Util/UtilEnv.class
-com/malk/server/aliyun/ALYR.class
-com/malk/service/dingtalk/DDClient.class
-com/malk/repository/entity/mutual/McAuthorizationPo.class
-com/malk/server/aliwork/YDParam$Retrieve_Condition_Update.class
-com/malk/base/BasePo.class
-com/malk/schedule/McScheduleTask.class
-com/malk/server/common/McREnum.class
 com/malk/repository/entity/primary/QMcTablePo.class
-com/malk/service/aliwork/YDClient.class
-com/malk/core/AsyncConfig.class
-com/malk/service/dingtalk/DDClient_Contacts.class
-com/malk/delegate/DDEvent_Delegate.class
-com/malk/server/dingtalk/DDR.class
-com/malk/Filter/CatchException.class
-com/malk/server/common/VenR.class
-com/malk/Util/UtilConvert$ConvertData.class
-com/malk/server/fxiaoke/FXXR.class
-com/malk/service/aliwork/YDService$UpsertLambda.class
-com/malk/server/aliwork/YDParam$Retrieve_ProcessInstanceIds.class
-com/malk/service/xbongbong/XBBClient.class
-com/malk/server/aliwork/YDParam$Update.class
-com/malk/Util/UtilList.class
-com/malk/test/McTestController.class
-com/malk/delegate/impl/McImplDelegate.class
-com/malk/server/dingtalk/crypto/DingCallbackCrypto.class
-com/malk/Util/UtilMc$1Obj.class
-com/malk/Util/UtilImport.class
-com/malk/config/mutilSource/PrimaryConfig.class
-com/malk/server/fxiaoke/FXKConf.class
-com/malk/server/aliwork/YDParam$Update_ProcessInstanceId.class
-com/malk/base/BaseDao.class
-com/malk/service/dingtalk/impl/DDImplClient_Event.class
 com/malk/repository/entity/mutual/QMcAuthorizationPo.class
-com/malk/server/dingtalk/DDFormComponentDto$DDFormComponentDtoBuilder.class
-com/malk/server/dingtalk/crypto/DingCallbackCrypto$PKCS7Padding.class
-com/malk/server/aliwork/YDParam$Create.class
-com/malk/service/h3yun/CYClient.class
-com/malk/service/aliwork/impl/YDClientImpl$1.class
 com/malk/base/QJpaMap.class
-com/malk/service/dingtalk/DDClient_Event.class
-com/malk/server/aliwork/YDParam$Definition.class
-com/malk/server/aliwork/YDParam.class
-com/malk/service/dingtalk/impl/DDImplClient_Workflow.class
-com/malk/repository/dao/primary/McTableDao.class
-com/malk/server/aliwork/YDParam$Delete_ProcessInstanceId.class
-com/malk/service/dingtalk/impl/DDImplClient_Attendance.class
-com/malk/test/dto/User.class
-com/malk/delegate/McDelegate$Invoke.class
-com/malk/config/JpaConfiguration.class
-com/malk/Util/UtilHttp$1.class
-com/malk/service/dingtalk/impl/DDImplService.class
 com/malk/repository/entity/slave/QJpaMapSlave.class
-com/malk/server/dingtalk/DDFormComponentDto.class
-com/malk/service/aliwork/impl/YDServiceImpl.class
-com/malk/service/aliwork/YDService.class
-com/malk/server/common/McR$McRBuilder.class
-com/malk/base/JpaMap.class
-com/malk/server/aliwork/YDParam$Retrieve_ProcessInstanceId.class
-com/malk/Util/UtilMap.class
-com/malk/server/aliwork/YDConf$FORM_QUERY.class
-com/malk/Util/UtilToken.class
-com/malk/server/dingtalk/crypto/DingCallbackCrypto$DingTalkEncryptException.class
-com/malk/server/ekuaibao/EKBConf.class
-com/malk/server/common/FilePath$Source.class
-com/malk/service/tencent/TXYInvoice.class
-com/malk/Util/UtilHttp$METHOD.class
-com/malk/Util/UtilNumber.class
-com/malk/server/aliwork/YDParam$YDParamBuilder.class
-com/malk/Util/UtilConvert.class
-com/malk/server/common/FilePath.class
-com/malk/server/common/McException.class
-com/malk/repository/dao/mutual/McAuthorizationDao.class

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

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