Browse Source

first commit

CRK 11 months ago
commit
07bb533860
100 changed files with 6772 additions and 0 deletions
  1. 42 0
      .gitignore
  2. 0 0
      README.md
  3. BIN
      mjava-KLNM/log/2024-10-22/info-0.log.gz
  4. BIN
      mjava-KLNM/log/2024-10-22/point-0.log.gz
  5. BIN
      mjava-KLNM/log/2024-10-22/warn-0.log.gz
  6. BIN
      mjava-KLNM/log/2024-10-28/info-0.log.gz
  7. BIN
      mjava-KLNM/log/2024-10-28/point-0.log.gz
  8. BIN
      mjava-KLNM/log/2024-11-12/info-0.log.gz
  9. BIN
      mjava-KLNM/log/2024-11-12/point-0.log.gz
  10. BIN
      mjava-KLNM/log/2024-11-12/warn-0.log.gz
  11. BIN
      mjava-KLNM/log/2025-02-20/info-0.log.gz
  12. BIN
      mjava-KLNM/log/2025-02-20/point-0.log.gz
  13. BIN
      mjava-KLNM/log/2025-02-20/warn-0.log.gz
  14. 88 0
      mjava-KLNM/pom.xml
  15. 30 0
      mjava-KLNM/src/main/java/com/malk/KLNM/Boot.java
  16. 59 0
      mjava-KLNM/src/main/java/com/malk/KLNM/controller/HXController.java
  17. 18 0
      mjava-KLNM/src/main/java/com/malk/KLNM/server/HXClient.java
  18. 9 0
      mjava-KLNM/src/main/java/com/malk/KLNM/server/WL.java
  19. 501 0
      mjava-KLNM/src/main/java/com/malk/KLNM/server/impl/HXImplClient.java
  20. 66 0
      mjava-KLNM/src/main/java/com/malk/KLNM/server/impl/WLImpl.java
  21. 35 0
      mjava-KLNM/src/main/java/com/malk/KLNM/timers/timer_one.java
  22. 141 0
      mjava-KLNM/src/main/java/com/malk/KLNM/util/DownHelp.java
  23. 131 0
      mjava-KLNM/src/main/java/com/malk/KLNM/util/javaHelp.java
  24. 67 0
      mjava-KLNM/src/main/resources/application-dev.yml
  25. 51 0
      mjava-KLNM/src/main/resources/application-prod.yml
  26. 379 0
      mjava-KLNM/src/test/java/test.java
  27. 51 0
      mjava/pom.xml
  28. 29 0
      mjava/src/main/java/com/malk/Boot.java
  29. 29 0
      mjava/src/main/java/com/malk/base/BaseDao.java
  30. 112 0
      mjava/src/main/java/com/malk/base/BaseDto.java
  31. 64 0
      mjava/src/main/java/com/malk/base/BasePo.java
  32. 9 0
      mjava/src/main/java/com/malk/base/BaseRepository.java
  33. 78 0
      mjava/src/main/java/com/malk/base/JpaMap.java
  34. 35 0
      mjava/src/main/java/com/malk/config/JpaConfiguration.java
  35. 58 0
      mjava/src/main/java/com/malk/config/WebConfiguration.java
  36. 41 0
      mjava/src/main/java/com/malk/config/mutilSource/DataSourceConfig.java
  37. 80 0
      mjava/src/main/java/com/malk/config/mutilSource/PrimaryConfig.java
  38. 76 0
      mjava/src/main/java/com/malk/config/mutilSource/SlaveConfig.java
  39. 73 0
      mjava/src/main/java/com/malk/controller/DDCallbackController.java
  40. 61 0
      mjava/src/main/java/com/malk/controller/TBCallBackController.java
  41. 101 0
      mjava/src/main/java/com/malk/core/AsyncConfig.java
  42. 36 0
      mjava/src/main/java/com/malk/delegate/DDEvent.java
  43. 17 0
      mjava/src/main/java/com/malk/delegate/McDelegate.java
  44. 25 0
      mjava/src/main/java/com/malk/delegate/TBEvent.java
  45. 49 0
      mjava/src/main/java/com/malk/delegate/impl/DDImplEvent.java
  46. 21 0
      mjava/src/main/java/com/malk/delegate/impl/McImplDelegate.java
  47. 29 0
      mjava/src/main/java/com/malk/delegate/impl/TBImplEvent.java
  48. 215 0
      mjava/src/main/java/com/malk/filter/CatchException.java
  49. 53 0
      mjava/src/main/java/com/malk/filter/ExceptionNotice.java
  50. 32 0
      mjava/src/main/java/com/malk/filter/RequestFilter.java
  51. 41 0
      mjava/src/main/java/com/malk/filter/RequestInterceptor.java
  52. 13 0
      mjava/src/main/java/com/malk/repository/dao/primary/McAuthorizationDao.java
  53. 10 0
      mjava/src/main/java/com/malk/repository/dao/primary/McTableDao.java
  54. 11 0
      mjava/src/main/java/com/malk/repository/dao/slave/McTableDao.java
  55. 51 0
      mjava/src/main/java/com/malk/repository/entity/primary/McAuthorizationPo.java
  56. 34 0
      mjava/src/main/java/com/malk/repository/entity/primary/McTablePo.java
  57. 34 0
      mjava/src/main/java/com/malk/repository/entity/slave/McTablePo.java
  58. 58 0
      mjava/src/main/java/com/malk/schedule/McScheduleTask.java
  59. 187 0
      mjava/src/main/java/com/malk/server/aliwork/YDConf.java
  60. 225 0
      mjava/src/main/java/com/malk/server/aliwork/YDParam.java
  61. 32 0
      mjava/src/main/java/com/malk/server/aliwork/YDR.java
  62. 33 0
      mjava/src/main/java/com/malk/server/aliyun/ALYR.java
  63. 42 0
      mjava/src/main/java/com/malk/server/common/FilePath.java
  64. 87 0
      mjava/src/main/java/com/malk/server/common/McConf.java
  65. 167 0
      mjava/src/main/java/com/malk/server/common/McException.java
  66. 40 0
      mjava/src/main/java/com/malk/server/common/McPage.java
  67. 105 0
      mjava/src/main/java/com/malk/server/common/McR.java
  68. 33 0
      mjava/src/main/java/com/malk/server/common/McREnum.java
  69. 55 0
      mjava/src/main/java/com/malk/server/common/VenR.java
  70. 76 0
      mjava/src/main/java/com/malk/server/dingtalk/DDConf.java
  71. 78 0
      mjava/src/main/java/com/malk/server/dingtalk/DDConfigSign.java
  72. 79 0
      mjava/src/main/java/com/malk/server/dingtalk/DDFormComponentDto.java
  73. 24 0
      mjava/src/main/java/com/malk/server/dingtalk/DDInterActiveCard.java
  74. 101 0
      mjava/src/main/java/com/malk/server/dingtalk/DDR.java
  75. 144 0
      mjava/src/main/java/com/malk/server/dingtalk/DDR_New.java
  76. 404 0
      mjava/src/main/java/com/malk/server/dingtalk/crypto/DingCallbackCrypto.java
  77. 42 0
      mjava/src/main/java/com/malk/server/ekuaibao/EKBConf.java
  78. 56 0
      mjava/src/main/java/com/malk/server/ekuaibao/EKBR.java
  79. 24 0
      mjava/src/main/java/com/malk/server/fxiaoke/FXKConf.java
  80. 67 0
      mjava/src/main/java/com/malk/server/fxiaoke/FXXR.java
  81. 59 0
      mjava/src/main/java/com/malk/server/h3yun/CYConf.java
  82. 90 0
      mjava/src/main/java/com/malk/server/teambition/TBConf.java
  83. 38 0
      mjava/src/main/java/com/malk/server/teambition/TBR.java
  84. 26 0
      mjava/src/main/java/com/malk/server/vika/VKConf.java
  85. 34 0
      mjava/src/main/java/com/malk/server/vika/VKR.java
  86. 65 0
      mjava/src/main/java/com/malk/server/xbongbong/DigestUtil.java
  87. 59 0
      mjava/src/main/java/com/malk/server/xbongbong/XBBConf.java
  88. 33 0
      mjava/src/main/java/com/malk/server/xbongbong/XBBR.java
  89. 27 0
      mjava/src/main/java/com/malk/service/aliwork/YDClient.java
  90. 100 0
      mjava/src/main/java/com/malk/service/aliwork/YDService.java
  91. 148 0
      mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java
  92. 330 0
      mjava/src/main/java/com/malk/service/aliwork/impl/YDServiceImpl.java
  93. 33 0
      mjava/src/main/java/com/malk/service/aliyun/ALYInvoice.java
  94. 87 0
      mjava/src/main/java/com/malk/service/aliyun/impl/ALYInvoiceImpl.java
  95. 34 0
      mjava/src/main/java/com/malk/service/dingtalk/DDClient.java
  96. 98 0
      mjava/src/main/java/com/malk/service/dingtalk/DDClient_Attendance.java
  97. 99 0
      mjava/src/main/java/com/malk/service/dingtalk/DDClient_Contacts.java
  98. 29 0
      mjava/src/main/java/com/malk/service/dingtalk/DDClient_Dedicated.java
  99. 39 0
      mjava/src/main/java/com/malk/service/dingtalk/DDClient_Event.java
  100. 0 0
      mjava/src/main/java/com/malk/service/dingtalk/DDClient_Extension.java

+ 42 - 0
.gitignore

@@ -0,0 +1,42 @@
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+/log/
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+mvnw
+mvnw.cmd
+
+# tmp file
+.tmp
+*/tmp
+*/target
+
+# web2 file
+*/src/main/resources/static/web
+*/src/main/resources/static/mjs

+ 0 - 0
README.md


BIN
mjava-KLNM/log/2024-10-22/info-0.log.gz


BIN
mjava-KLNM/log/2024-10-22/point-0.log.gz


BIN
mjava-KLNM/log/2024-10-22/warn-0.log.gz


BIN
mjava-KLNM/log/2024-10-28/info-0.log.gz


BIN
mjava-KLNM/log/2024-10-28/point-0.log.gz


BIN
mjava-KLNM/log/2024-11-12/info-0.log.gz


BIN
mjava-KLNM/log/2024-11-12/point-0.log.gz


BIN
mjava-KLNM/log/2024-11-12/warn-0.log.gz


BIN
mjava-KLNM/log/2025-02-20/info-0.log.gz


BIN
mjava-KLNM/log/2025-02-20/point-0.log.gz


BIN
mjava-KLNM/log/2025-02-20/warn-0.log.gz


+ 88 - 0
mjava-KLNM/pom.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>java-mcli</artifactId>
+        <groupId>com.malk</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mjava-KLNM</artifactId>
+    <description>科力纳米项目</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <sqlserver-jdbc.version>6.4.0.jre8</sqlserver-jdbc.version>
+    </properties>
+
+    <dependencies>
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.malk</groupId>
+            <artifactId>mjava</artifactId>
+            <version>${mjava.version}</version>
+        </dependency>
+
+        <!-- sqlserver依赖 -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <scope>runtime</scope>
+            <version>${sqlserver-jdbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.example</groupId>
+            <artifactId>apigwclient</artifactId>
+            <version>0.1.5</version>
+            <scope>system</scope>
+            <systemPath> ${project.basedir}/lib/apigwclient-0.1.5.jar</systemPath>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <!-- 如果没有该配置,devtools不会生效: 打包时关闭 -->
+                    <fork>false</fork>
+                    <!-- 避免中文乱码 -->
+                    <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+                </configuration>
+                <!-- 允许生成可运行jar -->
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

+ 30 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/Boot.java

@@ -0,0 +1,30 @@
+package com.malk.KLNM;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import javax.persistence.EntityManager;
+
+
+@EnableAsync
+@EnableJpaAuditing
+@SpringBootApplication(scanBasePackages = {"com.malk"})
+public class Boot {
+
+    public static void main(String... args) {
+        SpringApplication.run(Boot.class, args);
+    }
+
+    /**
+     * 让Spring管理JPAQueryFactory [不使用Qualifier详见mjava-Boot]
+     */
+    @Bean
+    public JPAQueryFactory jpaQueryFactory(EntityManager entityManager) {
+        
+        return new JPAQueryFactory(entityManager);
+    }
+}

+ 59 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/controller/HXController.java

@@ -0,0 +1,59 @@
+package com.malk.KLNM.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.malk.KLNM.server.HXClient;
+import com.malk.server.common.McR;
+import com.malk.utils.UtilMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.File;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping()
+public class HXController {
+    @Autowired
+    private HXClient hxClient;
+
+
+    @PostMapping("h3yun-http")
+    McR http(@RequestBody Map<String, String> data, @RequestParam String code) {
+        //deleteFile("/home/files");
+        log.info("氚云http请求, code = {}, body = {}", code, JSON.toJSONString(data));
+       System.out.println("氚云http请求, code = "+code+", body = "+JSON.toJSONString(data));
+      //  deleteFile("D:\\本地下载aaa\\");
+        String type = String.valueOf(data.get("HIH3type"));
+        if (type.equals("CStype01") || type.equals("CStype02")) {//船次附件数据上传
+            String sss= hxClient.CStoDP( data);
+        }
+        if (type.equals("CW01")|| type.equals("CW02")) {//财务附件数据上传 CW01:付款    CW02:收款
+            String sss= hxClient.CWtoDP( data);
+        }
+        //  String sss= hxClient.syncDP(String.valueOf(data.get("attachments")), String.valueOf(data.get("projectName")), String.valueOf(data.get("typeName")));
+        return McR.success(UtilMap.map("status", "是"));
+    }
+public  void  deleteFile(String directoryPath){
+    // 创建一个表示目录的File对象
+    File directory = new File(directoryPath);
+
+    // 获取目录下的所有文件和目录
+    File[] files = directory.listFiles();
+
+    // 确保目录存在且不是文件本身
+    if (files != null && directory.isDirectory()) {
+        for (File file : files) {
+            // 删除文件
+            if (file.isFile()) {
+                System.out.println("Deleting file: " + file.getName());
+                file.delete();
+            }
+        }
+    }
+}
+
+
+
+}

+ 18 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/server/HXClient.java

@@ -0,0 +1,18 @@
+package com.malk.KLNM.server;
+
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.Map;
+
+public interface HXClient {
+    /**
+     * 同步氚云附件到钉盘 [异步]
+     */
+    @Async
+    String syncDP(String sAttachments, String sProjectName, String typeName);
+
+    String CStoDP( Map<String, String> data );
+
+    String CWtoDP( Map<String, String> data );
+
+}

+ 9 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/server/WL.java

@@ -0,0 +1,9 @@
+package com.malk.KLNM.server;
+
+public interface WL {
+
+    /**
+     * 获取物料信息
+     */
+    void  get_wl();
+}

+ 501 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/server/impl/HXImplClient.java

@@ -0,0 +1,501 @@
+package com.malk.KLNM.server.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.malk.KLNM.server.HXClient;
+import com.malk.server.dingtalk.DDConf;
+import com.malk.service.dingtalk.DDClient;
+import com.malk.service.dingtalk.DDClient_Contacts;
+import com.malk.service.dingtalk.DDClient_Storage;
+import com.malk.service.dingtalk.DDService;
+import com.malk.service.h3yun.CYClient;
+import com.malk.utils.UtilMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
+public class HXImplClient implements HXClient {
+
+    @Autowired
+    private DDClient_Contacts ddClient_contacts;
+    @Autowired
+    private DDClient ddClient;
+    @Autowired
+    private DDConf ddConf;
+    @Autowired
+    private DDClient_Storage ddClient_storage;
+    @Autowired
+    private DDService ddService;
+    @Autowired
+    private CYClient cyClient;
+    @Override
+    public String syncDP(String sAttachments, String sProjectName, String typeName) {
+//        if (UtilString.isBlankCompatNull(sAttachments) || StringUtils.isBlank(sProjectName) || StringUtils.isBlank(typeName)) {
+//            return "";
+//        }
+//        // prd: 文件目录:钉盘空间 / 氚云项目附件 + 项目名称/ 日期(年月日)/ 附件名称
+//        String spaceId = "2928487153"; // 钉盘空间
+//        String parentId = "120089274640"; // 氚云项目附件
+//        // 获取用户unionId
+//        String unionId = String.valueOf(ddClient_contacts.getUserInfoById(ddClient.getAccessToken(), ddConf.getOperator()).get("unionid"));
+//        // 获取项目文件夹 [RETURN_DENTRY_IF_EXISTS: 文件夹名称冲突策略, 返回已存在文件夹, 避免查询文件夹列表]UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS")
+//        Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, sProjectName, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+//        dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, String.valueOf(dentry.get("id")), typeName, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+//        // 获取氚云附件ID, 项目名称
+//        List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+//        for (Map attachment : attachments) {
+//            H3file.getFile(String.valueOf(attachment.get("ObjectId")));
+//            String urlFile = cyClient.getTemporaryUrls(ddClient.getAccessToken(), String.valueOf(attachment.get("ObjectId")));
+//            // 上传文件
+//            ddService.uploadFileFormUrlForDingDrive(ddClient.getAccessToken(), unionId, spaceId, String.valueOf(dentry.get("id")), urlFile, String.valueOf(attachment.get("FileName")));
+//        }
+        return "";
+
+    }
+
+    /**
+     * 上传FN合同(合同附件)、Packing List清单;上传提单样本及盖章保函 到航次文件夹
+     *
+     * @param data
+     * @return
+     */
+    @Override
+    public String CStoDP(Map<String, String> data) {
+        log.info("data{0}", data);
+        String spaceId = "1818087334";//总文件夹空间ID
+        String parentId = "159568092237";//航次文件夹id
+        String CStype = String.valueOf(data.get("HIH3type"));//CStype01:上传FN合同(合同附件)、Packing List清单;CStype02: 上传提单样本及盖章保函
+        String YiJML = String.valueOf(data.get("YiJML"));
+        String ErJML = String.valueOf(data.get("ErJML"));
+        String SanJML = "提单保函";
+        String SiJML = String.valueOf(data.get("SiJML"));
+        String sAttachments = String.valueOf(data.get("sAttachments"));//附件列表
+        String CreatedById = String.valueOf(data.get("CreatedById"));//创建人 暂时没用到
+        // 获取用户unionId / token
+        String unionId = String.valueOf(ddClient_contacts.getUserInfoById(ddClient.getAccessToken(), ddConf.getOperator()).get("unionid"));
+        String token = ddClient.getAccessToken();
+        //获取全部文件或文件夹
+        Map map_MR = new HashMap();
+        List<Map> map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);
+        String PAR_ID1 = GetParentId(map_ALL, YiJML);//判断一级名称有无存在
+        if (PAR_ID1.equals("")) { //航次文件夹下无所属部门名称 文件夹
+            //创建一级文件夹 所属部门名称
+            Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, YiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+            parentId = String.valueOf(dentry.get("id"));
+            //新建第二层 船名+航次编号
+            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, ErJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+            parentId = String.valueOf(dentry.get("id"));
+            if (CStype.equals("CStype01")) {
+                //新建第三层 FN
+                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, "FN", UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+
+                // 获取氚云附件ID, 项目名称
+                List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                for (Map attachment : attachments) {
+                    //上传文件
+                    String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                }
+
+            } else if (CStype.equals("CStype02")) {
+                if (!SiJML.equals("")) {//新建第三层
+                    //新建第三层 放单保函
+                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SanJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    //  新建第四层 租家+合同号
+                    if (!SiJML.equals("")) {
+                        dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                        for (Map attachment : attachments) {
+                            //上传文件
+                            String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                        }
+                    }
+                }
+            }
+        } else {//航次文件夹下有 所属部门名称 文件夹
+            parentId = PAR_ID1;
+            // 判断第二层 船名+航次编号 有无
+            map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第二层全部文件或文件夹
+            String PAR_ID2 = GetParentId(map_ALL, ErJML);
+            if (PAR_ID2.equals("")) {  //// 所属部门名称下无 船名+航次编号文件夹
+                //新建第二层 船名+航次编号
+
+                Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, ErJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                if (CStype.equals("CStype01")) {
+                    //新建第三层 FN
+                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, "FN", UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    // 获取氚云附件ID, 项目名称
+                    List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                    for (Map attachment : attachments) {
+                        //上传文件
+                        String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                    }
+                } else if (CStype.equals("CStype02")) {
+                    if (!SiJML.equals("")) {//新建第三层
+                        //新建第三层 放单保函
+                        dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SanJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        //  新建第四层 租家+合同号
+                        if (!SiJML.equals("")) {
+                            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                            parentId = String.valueOf(dentry.get("id"));
+                            List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                            for (Map attachment : attachments) {
+                                //上传文件
+                                String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                            }
+                        }
+                    }
+                }
+            } else { //// 所属部门名称下有 船名+航次编号文件夹
+                parentId = PAR_ID2;
+                if (CStype.equals("CStype01")) {
+                    //判断有无放单保函
+                    map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第二层全部文件或文件夹
+                    String PAR_ID3 = GetParentId(map_ALL, "FN");
+                    if (PAR_ID3.equals("")) { //如果FN
+                        //新建第三层 FN
+                        Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, "FN", UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        // 获取氚云附件ID, 项目名称
+                        List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                        for (Map attachment : attachments) {
+                            //上传文件
+                            String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                        }
+                    } else {
+                        parentId = PAR_ID3;
+                        // 获取氚云附件ID, 项目名称
+                        List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                        for (Map attachment : attachments) {
+                            //上传文件
+                            String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                        }
+
+                    }
+
+                } else if (CStype.equals("CStype02")) {
+                    if (!SiJML.equals("")) {//租家+合同号文件数据
+                        //判断有无放单保函
+                        map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第二层全部文件或文件夹
+                        String PAR_ID3 = GetParentId(map_ALL, SanJML);
+                        if (PAR_ID3.equals("")) { //如果无放单保函
+                            if (!SiJML.equals("")) {//新建第三层
+                                //新建第三层 放单保函
+                                Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SanJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                                parentId = String.valueOf(dentry.get("id"));
+                                //  新建第四层 租家+合同号
+                                if (!SiJML.equals("")) {
+                                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                                    parentId = String.valueOf(dentry.get("id"));
+                                    List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                                    for (Map attachment : attachments) {
+                                        //上传文件
+                                        String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                                    }
+                                }
+                            }
+                        } else { //有放单保函
+                            parentId = PAR_ID3;
+                            //  新建第四层 租家+合同号
+                            if (!SiJML.equals("")) {
+                                //判断有无放单保函
+                                map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第放单保函下层全部文件或文件夹
+                                String PAR_ID4 = GetParentId(map_ALL, SiJML);
+                                if (PAR_ID4.equals("")) { //判断无 租家+合同号文件
+                                    Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                                    parentId = String.valueOf(dentry.get("id"));
+                                    List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                                    for (Map attachment : attachments) {
+                                        //上传文件
+                                        String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                                    }
+                                } else {////判断有 租家+合同号文件
+                                    parentId = PAR_ID4;
+                                    List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                                    for (Map attachment : attachments) {
+                                        //上传文件
+                                        String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        log.info("上传完成!");
+        return null;
+
+    }
+
+
+    @Override
+    public String CWtoDP(Map<String, String> data) {
+        String parentId = "159568150707";//财务文件夹id
+        String spaceId = "1818087334";//总文件夹空间ID
+        String CStype = String.valueOf(data.get("HIH3type"));
+        String YiJML = String.valueOf(data.get("YiJML"));
+        String ErJML = String.valueOf(data.get("ErJML"));
+        String SanJML = String.valueOf(data.get("SanJML"));
+        String SiJML = String.valueOf(data.get("SiJML"));
+        String WuJML = String.valueOf(data.get("WuJML"));
+        String LiuJML = String.valueOf(data.get("LiuJML"));
+        String sAttachments = String.valueOf(data.get("sAttachments"));//附件列表
+        String CreatedById = String.valueOf(data.get("CreatedById"));//创建人 暂时没用到
+        String unionId = String.valueOf(ddClient_contacts.getUserInfoById(ddClient.getAccessToken(), ddConf.getOperator()).get("unionid"));
+        String token = ddClient.getAccessToken();
+        //获取全部文件或文件夹
+        Map map_MR = new HashMap();
+        List<Map> map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);
+        String PAR_ID1 = GetParentId(map_ALL, YiJML);//判断一级名称有无存在
+        if (PAR_ID1.equals("")) {//如果没有一级文件夹
+            //创建一级文件夹  年
+            Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, YiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+            parentId = String.valueOf(dentry.get("id"));
+            //新建第二层 账户+币种
+            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, ErJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+            parentId = String.valueOf(dentry.get("id"));
+            //新建第三层  付款/收款
+            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SanJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+            parentId = String.valueOf(dentry.get("id"));
+            //新建第四层  月
+            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+            parentId = String.valueOf(dentry.get("id"));
+            if (CStype.equals("CW01")) {   //如果是付款
+                //新建第五层  天
+                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, WuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                //新建第六层  币种 + 金额
+                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                //循环上传文件
+                List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                for (Map attachment : attachments) {
+
+                    String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                }
+            } else if (CStype.equals("CW02")) {
+                //新建第五层  币种+金额+船名+开票抬头
+                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                //循环上传文件
+                List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                for (Map attachment : attachments) {
+                    String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                }
+            }
+
+
+        } else {
+            parentId = PAR_ID1;
+            // 判断第二层  账户+币种  有无
+            map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第二层全部文件或文件夹
+            String PAR_ID2 = GetParentId(map_ALL, ErJML);
+            if (PAR_ID2.equals("")) {    ////  如果无 账户+币种 文件夹
+                //新建第二层 账户+币种
+                Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, ErJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                //新建第三层  付款/收款
+                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SanJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                //新建第四层  月
+                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                parentId = String.valueOf(dentry.get("id"));
+                if (CStype.equals("CW01")) {   //如果是付款
+                    //新建第五层  天
+                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, WuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    //新建第六层  币种 + 金额
+                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    //循环上传文件
+                    List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                    for (Map attachment : attachments) {
+
+                        String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                    }
+                } else if (CStype.equals("CW02")) {
+                    //新建第五层  币种+金额+船名+开票抬头
+                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    //循环上传文件
+                    List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                    for (Map attachment : attachments) {
+                        String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                    }
+                }
+
+            } else {
+                parentId = PAR_ID2;
+                map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第二层全部文件或文件夹
+                String PAR_ID3 = GetParentId(map_ALL, SanJML);
+                if (PAR_ID3.equals("")) {////  如果无 付款/收款 文件夹
+                    //新建第三层  付款/收款
+                    Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SanJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    //新建第四层  月
+                    dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                    parentId = String.valueOf(dentry.get("id"));
+                    if (CStype.equals("CW01")) {   //如果是付款
+                        //新建第五层  天
+                        dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, WuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        //新建第六层  币种 + 金额
+                        dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        //循环上传文件
+                        List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                        for (Map attachment : attachments) {
+
+                            String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                        }
+                    } else if (CStype.equals("CW02")) {
+                        //新建第五层  币种+金额+船名+开票抬头
+                        dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        //循环上传文件
+                        List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                        for (Map attachment : attachments) {
+                            String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                        }
+                    }
+
+                } else { //如果有 付款/收款 文件夹
+                    parentId = PAR_ID3;
+                    map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第三层全部文件或文件夹
+                    String PAR_ID4 = GetParentId(map_ALL, SiJML);
+                    if (PAR_ID4.equals("")) {////  如果无 月 文件夹
+                        //新建第四层  月
+                        Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, SiJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                        parentId = String.valueOf(dentry.get("id"));
+                        if (CStype.equals("CW01")) {   //如果是付款
+                            //新建第五层  天
+                            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, WuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                            parentId = String.valueOf(dentry.get("id"));
+                            //新建第六层  币种 + 金额
+                            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                            parentId = String.valueOf(dentry.get("id"));
+                            //循环上传文件
+                            List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                            for (Map attachment : attachments) {
+
+                                String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                            }
+                        } else if (CStype.equals("CW02")) {
+                            //新建第五层  币种+金额+船名+开票抬头
+                            dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                            parentId = String.valueOf(dentry.get("id"));
+                            //循环上传文件
+                            List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                            for (Map attachment : attachments) {
+                                String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                            }
+                        }
+
+                    } else { ////  如果有  月  文件夹
+                        parentId = PAR_ID4;
+                        if (CStype.equals("CW01")) {   //如果是付款
+                            map_ALL = ddClient_storage.getDentries(token, unionId, "1818087334", parentId, map_MR);//获取第四层全部文件或文件夹
+                            String PAR_ID5 = GetParentId(map_ALL, WuJML);
+                            if (PAR_ID5.equals("")) {//如果无 天 文件夹
+                                //新建第五层  天
+                                Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, WuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                                parentId = String.valueOf(dentry.get("id"));
+                                //新建第六层  币种 + 金额
+                                dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                                parentId = String.valueOf(dentry.get("id"));
+                                //循环上传文件
+                                List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                                for (Map attachment : attachments) {
+
+                                    String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                                }
+
+                            } else {
+                                parentId = PAR_ID5;
+
+                                //新建第六层  币种 + 金额
+                                Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                                parentId = String.valueOf(dentry.get("id"));
+                                //循环上传文件
+                                List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                                for (Map attachment : attachments) {
+
+                                    String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                                }
+
+                            }
+                        } else if (CStype.equals("CW02")) {
+                            //新建第五层  币种+金额+船名+开票抬头
+                            Map dentry = ddClient_storage.addFolders(ddClient.getAccessToken(), unionId, spaceId, parentId, LiuJML, UtilMap.map("conflictStrategy", "RETURN_DENTRY_IF_EXISTS"));
+                            parentId = String.valueOf(dentry.get("id"));
+                            //循环上传文件
+                            List<Map> attachments = (List<Map>) JSON.parse(sAttachments);
+                            for (Map attachment : attachments) {
+                                String FileMsg = ddService.getFile_new(ddClient.getAccessToken(), unionId, spaceId, parentId, String.valueOf(attachment.get("FileId")), String.valueOf(attachment.get("FileName")));
+                            }
+                        }
+
+                    }
+
+                }
+
+
+            }
+
+        }
+
+
+        return "";
+    }
+
+    /*
+    根据名称,判断对应的parentId
+     */
+    public String GetParentId(List<Map> map_ALL, String name) {
+        String parentId = "";
+        if (map_ALL != null) {
+            for (Map<String, String> map : map_ALL) {
+                if (map.get("name").equals(name)) {//
+                    parentId = map.get("id");
+                }
+            }
+        }
+        return parentId;
+    }
+
+
+    //删除
+//    String directoryPath = "D:\\本地下载aaa\\";
+//
+//    // 创建File对象表示目录
+//    File directory = new File(directoryPath);
+//    // 确保目录存在并且是一个目录
+//                if (directory.exists() && directory.isDirectory()) {
+//        // 获取目录下所有文件和文件夹
+//        File[] files = directory.listFiles();
+//
+//        if (files != null) { // 确保文件数组不为空
+//            for (File file : files) {
+//                // 如果是文件,则可以直接删除
+//                if (file.isFile()) {
+//                    file.delete();
+//                }
+//            }
+//        }
+//        System.out.println("删除成功!");
+//    } else {
+//        System.out.println("Directory does not exist or is not a directory.");
+//    }
+}

+ 66 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/server/impl/WLImpl.java

@@ -0,0 +1,66 @@
+package com.malk.KLNM.server.impl;
+
+import com.malk.KLNM.server.WL;
+import com.malk.KLNM.util.javaHelp;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Service;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@EnableScheduling
+@Service
+@Slf4j
+public class WLImpl implements WL {
+
+    /**
+     * 获取物料信息
+     */
+    @Override
+    public void get_wl() {
+        try {
+//            // 定义请求的URL
+//            String url = "https://api.kingdee.com/jdy/v2/bd/material_detail?id=1&number=001";
+//            // 创建URL对象
+//            URL apiUrl = new URL(url);
+//            HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
+//            // 设置请求方法为GET
+//            connection.setRequestMethod("GET");
+//            // 设置请求头
+//            connection.setRequestProperty("Content-Type", "application/json");//固定传:application/json
+//            connection.setRequestProperty("X-Api-ClientID", "300657");//固定传应用id
+//            connection.setRequestProperty("X-Api-Auth-Version", "2.0");//固定传:2.0
+//            connection.setRequestProperty("X-Api-TimeStamp", String.valueOf(System.currentTimeMillis()));//当前时间毫秒时间戳,有效期为5min
+//            connection.setRequestProperty("X-Api-Nonce", javaHelp.get_randomNumber());//随机正整数
+//            connection.setRequestProperty("X-Api-SignHeaders", "X-Api-TimeStamp,X-Api-Nonce");//固定传:X-Api-TimeStamp,X-Api-Nonce
+//            connection.setRequestProperty("X-Api-Signature", "xxx");
+//            connection.setRequestProperty("app-token", "xxx");
+//            connection.setRequestProperty("X-GW-Router-Addr", "https://tf.jdy.com");
+//            // 发送请求
+//            connection.connect();
+//
+//            // 获取响应码
+//            int responseCode = connection.getResponseCode();
+//            System.out.println("Response Code: " + responseCode);
+//
+//            // 读取响应内容
+//            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+//            String inputLine;
+//            StringBuilder response = new StringBuilder();
+//
+//            while ((inputLine = in.readLine()) != null) {
+//                response.append(inputLine);
+//            }
+//            in.close();
+//
+//            // 打印响应内容
+//            System.out.println("Response: " + response.toString());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

+ 35 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/timers/timer_one.java

@@ -0,0 +1,35 @@
+package com.malk.KLNM.timers;
+
+import com.malk.KLNM.server.WL;
+import com.malk.KLNM.util.javaHelp;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+@Slf4j
+@Configuration
+@EnableScheduling
+public class timer_one {
+
+
+    @Autowired
+    private WL wl;//物料
+
+    @Async
+   // @Scheduled(fixedRate = 100)
+    //  @Scheduled(cron = "0 0 4 * * ?")//凌晨四点触发
+    public void LegalEntityList() throws Exception {
+
+        log.info("开启科力纳米物料同步!");
+        System.out.println("开启科力纳米物料同步!");
+        wl.get_wl();
+        log.info("科力纳米物料同步-结束!");
+        System.out.println("科力纳米物料同步-结束!");
+    }
+
+
+
+}

+ 141 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/util/DownHelp.java

@@ -0,0 +1,141 @@
+package com.malk.KLNM.util;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class DownHelp {
+    public static void getInternetResdoPost(  String fileId) {
+        // 定义输出流 字节输出流,可以用来写转换之后的字节到文件中
+        OutputStreamWriter out = null;
+        // 定义输入流
+        BufferedReader br = null;
+        String result = "";
+        FileOutputStream outfile = null;
+        try {
+            // 统一资源
+            URL url = new URL("https://www.h3yun.com/Api/DownloadBizObjectFile");
+
+            // 打开和url之间的连接
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+
+            // 设定请求的方法为"POST",默认是GET
+            // post与get的不同之处在于post的参数不是放在URL字串里面,而是放在http请求的正文内。
+            conn.setRequestMethod("POST");
+
+            // 设置30秒连接超时
+            conn.setConnectTimeout(30000);
+            // 设置30秒读取超时
+            conn.setReadTimeout(30000);
+
+            // 设置是否向httpUrlConnection输出,因为这个是post请求,参数要放在http正文内,因此需要设为true, 默认情况下是false;
+            conn.setDoOutput(true);
+            // 设置是否从httpUrlConnection读入,默认情况下是true;
+            conn.setDoInput(true);
+
+            // Post请求不能使用缓存
+            conn.setUseCaches(false);
+
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive"); // 维持长链接
+            conn.setRequestProperty("Content-Type", "application/json;charset=utf-8");
+            // 必须要有的身份认证参数 在组织 界面 钉钉右上角 我的头像点击 后 系统管理》系统集成中有这两个字段
+            conn.setRequestProperty("EngineCode", "jd4fneb66qz2gfvau6svhkxk1");
+            conn.setRequestProperty("EngineSecret", "F8K2W/09HZpQGiN0IgRNNi+EJKCFz9Zu6xTNsz6yjCpsAS0+tbSEeQ==");
+            // 连接,从上述url.openConnection()至此的配置必须要在connect之前完成,
+            conn.connect();
+            String jsonInputString = "{\"EngineCode\":\"jd4fneb66qz2gfvau6svhkxk1\", \"attachmentId\":\""+fileId+"\"}";
+
+            /**
+             * 下面的三句代码,就是调用第三方http接口
+             */
+            // 获取URLConnection对象对应的输出流
+            // 此处getOutputStream会隐含的进行connect(即:如同调用上面的connect()方法,所以在开发中不调用上述的connect()也可以)。
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            // 发送请求参数即数据
+            out.write(jsonInputString);
+            // flush输出流的缓冲
+            out.flush();
+
+            /**
+             * 下面的代码相当于,获取调用第三方http接口后返回的结果
+             */
+            // 获取URLConnection对象对应的输入流
+            InputStream is = conn.getInputStream();
+
+            // 获取文件类型 例如:返回的格式是:attachment;filename=1.png
+            String headerField = conn.getHeaderField("Content-Disposition");
+            headerField = new String(headerField.getBytes("GB2312"));
+            headerField = new String(headerField.getBytes("utf-8"));
+            // 截取得到正确的文件名
+            String filename = substringGetType(headerField);
+            byte[] NEWdata = getByteData(is);
+
+            // 建立存储的目录、保存的文件名
+            File file = new File("D:\\本地下载aaa\\" + "文件下载");
+            if (!file.exists()) {
+                file.mkdirs();
+            }
+            // 修改文件名
+            File res = new File(file + File.separator + filename);
+            // 写入输出流
+            outfile = new FileOutputStream(res);
+            outfile.write(NEWdata);
+            System.out.println("下载成功!");
+            // 关闭流
+            is.close();
+            // 断开连接,disconnect是在底层tcp socket链接空闲时才切断,如果正在被其他线程使用就不切断。
+            conn.disconnect();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("下载失败!");
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                    outfile.close();
+                }
+                if (br != null) {
+                    br.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     *
+     * @Title: getByteData
+     * @Description: 从输入流中获取字节数组
+     */
+    private static byte[] getByteData(InputStream in) throws IOException {
+        byte[] b = new byte[1024];
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        int len = 0;
+        while ((len = in.read(b)) != -1) {
+            bos.write(b, 0, len);
+        }
+        if (null != bos) {
+            bos.close();
+        }
+        return bos.toByteArray();
+    }
+
+    /**
+     *
+     * @Title: substringGetPng
+     * @Description: 截取字符串得到正确的文件类型
+     *
+     */
+    public static String substringGetType(String str) {
+        // 获得第=号的位置
+        int index = str.indexOf("=");
+        String result = str.substring(index + 1);
+        // 输出结果
+        System.out.println("下载文件名:" + result);
+        return result;
+    }
+}

+ 131 - 0
mjava-KLNM/src/main/java/com/malk/KLNM/util/javaHelp.java

@@ -0,0 +1,131 @@
+package com.malk.KLNM.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.smecloud.apigw.client.ApigwClient;
+import com.smecloud.apigw.model.ApiRequest;
+import com.smecloud.apigw.model.ApiResult;
+import com.smecloud.apigw.model.ApigwConfig;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import static com.smecloud.apigw.constant.HttpMethod.GET;
+@Slf4j
+public class javaHelp {
+
+    /**
+     * 获取随机正整数
+     *
+     * @return
+     */
+    public static String get_randomNumber() {
+        Random random = new Random();
+
+        // 指定随机数的范围(例如,1到100之间的随机正整数)
+        int min = 100000000;
+        int max = 999999999;
+
+        // 生成随机数
+        int randomNumber = random.nextInt((max - min) + 1) + min;
+        return String.valueOf(randomNumber);
+
+    }
+
+    /**
+     * 获取金蝶app_signature
+     */
+    public static String get_app_signature(String app_key, String app_Secret) {
+        try {
+            // 创建一个Mac实例,并指定使用HmacSHA256算法
+            Mac mac = Mac.getInstance("HmacSHA256");
+
+            // 使用appSecret作为密钥
+            SecretKeySpec secretKeySpec = new SecretKeySpec(app_Secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+            mac.init(secretKeySpec);
+
+            // 对appKey进行加密
+            byte[] hmacBytes = mac.doFinal(app_key.getBytes(StandardCharsets.UTF_8));
+
+            // 将加密结果转换为16进制字符串
+            StringBuilder hexString = new StringBuilder(2 * hmacBytes.length);
+            for (byte b : hmacBytes) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) hexString.append('0');
+                hexString.append(hex);
+            }
+
+            // 将16进制字符串进行Base64编码
+            byte[] hexBytes = hexString.toString().getBytes(StandardCharsets.UTF_8);
+            String base64Encoded = Base64.getEncoder().encodeToString(hexBytes);
+
+            return base64Encoded;
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+            throw new RuntimeException("Error while generating HMAC-SHA256 hash", e);
+        }
+    }
+
+    /**
+     * 获取金蝶get_appToken
+     */
+
+    public static String get_appToken() throws IOException {
+        String setClientID = "300657";
+        String setClientSecret = "9163551ef2e2a2cd2398dc05ec527132";
+        String app_key = "tcyhmh71";
+        String app_Secret = "994a439a551324bc207cf8771eb645ffc8044e1d";
+        ApigwConfig config = new ApigwConfig();
+        //设置client_id
+        config.setClientID(setClientID);
+        //设置client_secret
+        config.setClientSecret(setClientSecret);
+        ApigwClient apigwClient = ApigwClient.getInstance();
+        //初始化API网关客户端
+        apigwClient.init(config);
+        ApiRequest request = new ApiRequest(GET, "api.kingdee.com", "/jdyconnector/app_management/kingdee_auth_token");
+        Map<String, String> map = new HashMap<>();
+        map.put("app_key", app_key);
+        String app_signature = get_app_signature(app_key, app_Secret);
+        map.put("app_signature", app_signature);
+        request.setQuerys(map);
+        request.setBodyJson(JSONObject.toJSONString("").getBytes());
+        ApiResult result = ApigwClient.getInstance().send(request);
+        // 解析JSON字符串
+        String jsonBody = result.getBody();
+// 解析JSON字符串
+        JSONObject jsonObject = JSON.parseObject(jsonBody);
+        JSONObject dataObject = jsonObject.getJSONObject("data");
+        if (jsonObject.get("description").equals("成功")){
+            String appToken = dataObject.getString("app-token");
+            System.out.println("获取token成功:"+appToken);
+            log.info("获取token成功:"+appToken);
+            return appToken;
+        }else {
+            System.out.println("获取token失败:"+result.getBody() );
+            log.info("获取token失败:"+result.getBody());
+            return "";
+        }
+// 获取app-token,注意fastjson对key中包含特殊字符(如-)的处理是自动的
+
+    }
+    ////
+
+
+}
+
+

+ 67 - 0
mjava-KLNM/src/main/resources/application-dev.yml

@@ -0,0 +1,67 @@
+# 环境配置
+server:
+  port: 8110
+  servlet:
+    context-path: /api/hanxin
+
+# condition
+spel:
+  scheduling: true        # 定时任务是否执行
+  multiSource: false       # 是否多数据源配置
+
+nc:
+  scheduling: true        # 定时任务是否执行
+  multiSource: false       # 是否多数据源配置
+
+spring:
+  # database
+  datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: cp-root@2022++
+    url: jdbc:mysql://47.97.181.40:3306/dingtalk?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.MySQL57Dialect
+
+#filepath
+file:
+  path:
+    file: /Users/malk/server/_Tool/var/mjava/tmp/file
+    image: /Users/malk/server/_Tool/var/mjava/tmp/image
+    tmp: /Users/malk/server/_Tool/var/mjava/tmp
+  source:
+    fonts: /Users/malk/server/_Tool/fonts/simsun.ttc
+logging:
+  file:
+    path: /Users/malk/server/_Tool/var/mjava/log
+
+# dingtalk-汉信
+dingtalk:
+  agentId: 3297559800
+  appKey: dingssx5a9pev3qcbvq9
+  appSecret: LJgj3NFht0ffbfFc7RYdHiL53blYh_QlUZk1zec2pH_tsxmhe6hYgiBlvdKY3u32
+  corpId: ding50becc1a2807185135c2f4657eb6378f
+  aesKey:
+  token:
+  operator: "683135622237866009"
+  #operator: "manager1982"   #  - OA管理员账号 [首字符若为0需要转一下字符串]
+
+
+
+#SqlServer
+sqlserver:
+  url: jdbc:sqlserver://58.246.128.122:2433;databaseName=lanyun
+  username: sa
+  password: " #"
+
+
+# h3yun
+h3yun:
+  engineCode: jd4fneb66qz2gfvau6svhkxk1
+  secret: F8K2W/09HZpQGiN0IgRNNi+EJKCFz9Zu6xTNsz6yjCpsAS0+tbSEeQ==

+ 51 - 0
mjava-KLNM/src/main/resources/application-prod.yml

@@ -0,0 +1,51 @@
+server:
+  port: 8110
+  servlet:
+    context-path: /api/hanxin
+
+# condition
+spel:
+  scheduling: true        # 定时任务是否执行
+  multiSource: false      # 是否多数据源配置
+
+nc:
+  scheduling: true        # 定时任务是否执行
+  multiSource: false      # 是否多数据源配置
+
+spring:
+  # database
+  datasource:
+    hikari:
+      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: cp-root@2022++
+    url: jdbc:mysql://47.97.181.40:3306/dingtalk?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+  jpa:
+    database: MYSQL
+    database-platform: org.hibernate.dialect.MySQL57Dialect
+
+
+# dingtalk-汉信
+dingtalk:
+  agentId: 3297559800
+  appKey: dingssx5a9pev3qcbvq9
+  appSecret: LJgj3NFht0ffbfFc7RYdHiL53blYh_QlUZk1zec2pH_tsxmhe6hYgiBlvdKY3u32
+  corpId: ding50becc1a2807185135c2f4657eb6378f
+  aesKey:
+  token:
+ # operator: "683135622237866009"
+  operator: "manager1982"   # 李若冰- OA管理员账号 [首字符若为0需要转一下字符串]
+
+
+sqlserver:
+  url: jdbc:sqlserver://192.168.0.237:1433;databaseName=lanyun
+  userName: sa
+  password: " !2024#"
+
+
+
+# h3yun-
+h3yun:
+  engineCode: jd4fneb66qz2gfvau6svhkxk1
+  secret: F8K2W/09HZpQGiN0IgRNNi+EJKCFz9Zu6xTNsz6yjCpsAS0+tbSEeQ==

+ 379 - 0
mjava-KLNM/src/test/java/test.java

@@ -0,0 +1,379 @@
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.malk.KLNM.Boot;
+import com.malk.server.common.McException;
+import com.smecloud.apigw.client.ApigwClient;
+import com.smecloud.apigw.model.ApiRequest;
+import com.smecloud.apigw.model.ApiResult;
+import com.smecloud.apigw.model.ApigwConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.*;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
+import static com.smecloud.apigw.constant.HttpMethod.GET;
+
+
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Boot.class)
+public class test {
+
+    @Test
+    public void testService() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
+
+        Map<String, String> mes_params = push_app_authorize("300657", "9163551ef2e2a2cd2398dc05ec527132", "356919829745242112");//根据应用ID(Client ID),第三方实例ID调取实时
+        if (mes_params.size() > 0) {
+            String appSecret = mes_params.get("appSecret").toString();
+            String domain = mes_params.get("domain").toString();
+            if (domain != "" && appSecret != "" && domain != null && appSecret != null) {
+                get_material("300657", domain, appSecret, "9163551ef2e2a2cd2398dc05ec527132");
+            }
+        }
+//
+//        CookieStore cookieStore = new BasicCookieStore();
+//        // 创建一个 Httpclient 实例
+//        CloseableHttpClient httpclient = HttpClients.custom().setDefaultCookieStore(cookieStore).build();
+//        HttpGet otherRequest = new HttpGet("https://api.kingdee.com/jdy/v2/bd/material");
+//        otherRequest.setHeader("Content-Type", "300657");
+//        otherRequest.setHeader("X-Api-ClientID", "application/json");
+//        otherRequest.setHeader("X-Api-Auth-Version", "2.0");
+//        otherRequest.setHeader("X-Api-TimeStamp", String.valueOf(System.currentTimeMillis()));
+//        otherRequest.setHeader("X-Api-SignHeaders", "X-Api-TimeStamp,X-Api-Nonce");
+//        otherRequest.setHeader("X-Api-Nonce", this.get_randomNumber());
+//        otherRequest.setHeader("X-Api-Signature", get_app_signature("tcyhmh71","206bfff1ea61c4699f55ce895848c3e52a8dff02"));
+//        otherRequest.setHeader("app-token", this.get_appToken());
+//        otherRequest.setHeader("X-GW-Router-Addr", this.get_appToken());
+//        CloseableHttpResponse otherResponse = httpclient.execute(otherRequest);
+
+    }
+
+    /**
+     * 主动获取授权
+     *
+     * @return
+     */
+    public static Map<String, String> push_app_authorize(String clientId, String Secret, String outerInstanceId) throws IOException, NoSuchAlgorithmException, InvalidKeyException {
+        Map<String, String> mes_params = new TreeMap<>();
+        String url = "https://api.kingdee.com/jdyconnector/app_management/push_app_authorize?outerInstanceId=" + outerInstanceId;
+        HttpPost httpPost = new HttpPost(url);
+        String TimeStamp = String.valueOf(System.currentTimeMillis());
+        String randomNumber = get_randomNumber();
+        /**
+         * Signature加密
+         */
+        String QQFS = "POST";
+        String path = "/jdyconnector/app_management/push_app_authorize";
+        Map<String, String> params = new TreeMap<>(); // TreeMap 会自动按键的 ASCII 码排序
+        params.put("outerInstanceId", outerInstanceId);
+        String Signature = get_app_signature(Secret, QQFS, path, params, TimeStamp, randomNumber);//X-Api-Signature加密获取
+        httpPost.setHeader("X-Api-ClientID", clientId);
+        httpPost.setHeader("X-Api-Auth-Version", "2.0");
+        httpPost.setHeader("X-Api-TimeStamp", TimeStamp);
+        httpPost.setHeader("X-Api-Nonce", randomNumber);
+        httpPost.setHeader("X-Api-SignHeaders", "X-Api-TimeStamp,X-Api-Nonce");
+        httpPost.setHeader("X-Api-Signature", Signature);
+        // 设置请求体(如果有)
+        httpPost.setEntity(new StringEntity("", "UTF-8"));
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            // 发送请求并处理响应
+            HttpResponse response = httpClient.execute(httpPost);
+            String responseBody = EntityUtils.toString(response.getEntity());
+            JSONObject jsonObject = JSON.parseObject(responseBody);
+            if (jsonObject.getString("code").equals("200")) {
+                JSONArray dataArray = jsonObject.getJSONArray("data");
+                // 假设JSON数组中只有一个对象,或者我们只关心第一个对象
+                JSONObject dataObject = dataArray.getJSONObject(0);
+                String appSecret = dataObject.getString("appSecret");
+                String domain = dataObject.getString("domain");
+                mes_params.put("appSecret", appSecret);
+                mes_params.put("domain", domain);
+
+            } else {
+
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return mes_params;
+    }
+
+    /**
+     * 获取商品列表
+     *
+     * @return
+     */
+    public static String get_material(String clientId, String domain, String appSecret, String Secret) throws IOException, NoSuchAlgorithmException, InvalidKeyException {
+
+        String url = "https://api.kingdee.com/jdy/v2/bd/material";
+        HttpGet httpGet = new HttpGet(url);
+        String TimeStamp = String.valueOf(System.currentTimeMillis());
+        String randomNumber = get_randomNumber();
+        /**
+         * Signature加密
+         */
+        String QQFS = "GET";
+        String path = "/jdy/v2/bd/material";
+        Map<String, String> params = new TreeMap<>(); // TreeMap 会自动按键的 ASCII 码排序
+
+        String Signature = get_app_signature(Secret, QQFS, path, params, TimeStamp, randomNumber);//X-Api-Signature加密获取
+        httpGet.setHeader("X-Api-ClientID", clientId);
+        httpGet.setHeader("X-Api-Auth-Version", "2.0");
+        httpGet.setHeader("X-Api-TimeStamp", TimeStamp);
+        httpGet.setHeader("X-Api-Nonce", randomNumber);
+        httpGet.setHeader("X-Api-SignHeaders", "X-Api-TimeStamp,X-Api-Nonce");
+        httpGet.setHeader("X-Api-Signature", Signature);
+        httpGet.setHeader("Content-Type", "application/json");
+        httpGet.setHeader("app-token", get_appToken(appSecret));
+        httpGet.setHeader("X-GW-Router-Addr", domain);
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            // 发送请求并处理响应
+            HttpResponse response = httpClient.execute(httpGet);
+            String responseBody = EntityUtils.toString(response.getEntity());
+            JSONObject jsonObject = JSON.parseObject(responseBody);
+            System.out.println("jsonObject:" + jsonObject);
+            String errcode = jsonObject.getString("errcode");
+            if (errcode.equals("0")) {//判断有返回值
+                JSONObject dataObject = jsonObject.getJSONObject("data");
+                // 从data对象中获取rows数组
+                JSONArray rowsArray = dataObject.getJSONArray("rows");
+                // 循环遍历rows数组中的每个对象
+                for (int i = 0; i < rowsArray.size(); i++) {
+                    JSONObject rowObject = rowsArray.getJSONObject(i);
+                    // 获取rowObject中的任意字段,例如name
+                    String name = rowObject.getString("name");
+                    // 打印或其他处理
+                    System.out.println("商品名称: " + name);
+                    // 你可以继续获取其他字段并进行处理
+                }
+
+            } else {
+
+            }
+
+
+        } catch (McException e) {
+             System.out.println("e:"+e.getMessage());
+        }
+        return "";
+
+    }
+
+
+    //正整数
+    public static String get_randomNumber() {
+        Random random = new Random();
+
+        // 指定随机数的范围(例如,1到100之间的随机正整数)
+        int min = 100000000;
+        int max = 999999999;
+
+        // 生成随机数
+        int randomNumber = random.nextInt((max - min) + 1) + min;
+        return String.valueOf(randomNumber);
+
+    }
+
+    public static String get_appToken(String appSecret) throws IOException {
+        ApigwConfig config = new ApigwConfig();
+        //设置client_id
+        config.setClientID("300657");
+        //设置client_secret
+        config.setClientSecret("9163551ef2e2a2cd2398dc05ec527132");
+        ApigwClient apigwClient = ApigwClient.getInstance();
+        //初始化API网关客户端
+        apigwClient.init(config);
+        ApiRequest request = new ApiRequest(GET, "api.kingdee.com", "/jdyconnector/app_management/kingdee_auth_token");
+        Map<String, String> map = new HashMap<>();
+        map.put("app_key", "tcyhmh71");
+        String app_signature = get_app_signature("tcyhmh71", appSecret);
+        map.put("app_signature", app_signature);
+        request.setQuerys(map);
+        request.setBodyJson(JSONObject.toJSONString("").getBytes());
+        ApiResult result = ApigwClient.getInstance().send(request);
+// 解析JSON字符串
+        String jsonBody = result.getBody();
+// 解析JSON字符串
+        JSONObject jsonObject = JSON.parseObject(jsonBody);
+        JSONObject dataObject = jsonObject.getJSONObject("data");
+
+// 获取app-token,注意fastjson对key中包含特殊字符(如-)的处理是自动的
+        String appToken = dataObject.getString("app-token");
+
+        System.out.println(appToken);
+        return appToken;
+    }
+
+
+    //加密X-Api-Signature加密规则
+    public static String get_app_signature(String app_key, String appSecret) {
+        try {
+            // 创建一个Mac实例,并指定使用HmacSHA256算法
+            Mac mac = Mac.getInstance("HmacSHA256");
+
+            // 使用appSecret作为密钥
+            SecretKeySpec secretKeySpec = new SecretKeySpec(appSecret.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+            mac.init(secretKeySpec);
+
+            // 对appKey进行加密
+            byte[] hmacBytes = mac.doFinal(app_key.getBytes(StandardCharsets.UTF_8));
+
+            // 将加密结果转换为16进制字符串
+            StringBuilder hexString = new StringBuilder(2 * hmacBytes.length);
+            for (byte b : hmacBytes) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) hexString.append('0');
+                hexString.append(hex);
+            }
+
+            // 将16进制字符串进行Base64编码
+            byte[] hexBytes = hexString.toString().getBytes(StandardCharsets.UTF_8);
+            String base64Encoded = Base64.getEncoder().encodeToString(hexBytes);
+
+            return base64Encoded;
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+            throw new RuntimeException("Error while generating HMAC-SHA256 hash", e);
+        }
+    }
+
+
+    //加密X-Api-Signature生成规则
+    public static String get_app_signature(String clientSecret, String QQFS, String path, Map<String, String> params, String TimeStamp, String randomNumber) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
+        String method = QQFS;
+        String originalString = path;
+        String target = "/"; // 要替换的字符,转换为字符串
+        String replacement = "%2F"; // 替换后的字符串
+        // 使用String的replace方法替换所有出现的target为replacement
+        String encodedString = originalString.replace(target, replacement);
+        StringBuilder signatureText = new StringBuilder();
+        signatureText.append(method).append("\n");
+        signatureText.append(encodedString).append("\n");
+        // 拼接 params 参数(进行两次 URL 编码并转换为大写,但 TreeMap 已排序且只需编码一次)
+
+        if (params != null) {
+            Map<String, String> encodedParams = doubleUrlEncodeParams(params);
+            // 按参数名的ASCII码升序排序
+            List<Map.Entry<String, String>> sortedParams = new ArrayList<>(encodedParams.entrySet());
+            sortedParams.sort(Comparator.comparing(Map.Entry::getKey));
+            String signString = generateSignString(sortedParams);
+            signatureText.append(signString).append("\n");
+            System.out.println("签名字符串: " + signString);
+        } else {
+            signatureText.append("\n");
+        }
+        // 添加 headers 参数(x-api-nonce 和 x-api-timestamp,小写编码但拼接时保持原样)
+        // 注意:这里实际上不需要再次编码,因为 nonce 和 timestamp 通常是数字或基64字符串,且规则要求小写(但编码后是大写字母的情况在这里不适用)
+        signatureText.append("x-api-nonce:").append(randomNumber).append("\n");
+        signatureText.append("x-api-timestamp:").append(TimeStamp).append("\n");
+
+        // 输出签名原文(实际签名算法应在此原文基础上进行)
+        System.out.println("Signature Text:\n" + signatureText.toString());
+
+        String message = signatureText.toString();
+
+
+        String hmacHex = get_app_signature(message, clientSecret);
+
+
+        return hmacHex;
+    }
+
+    /**
+     * 对参数值进行两次URL编码,并将字母转为大写
+     */
+    private static Map<String, String> doubleUrlEncodeParams(Map<String, String> params) {
+        Map<String, String> encodedParams = new HashMap<>();
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            try {
+                // 第一次URL编码
+                String firstEncode = URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
+                // 第二次URL编码
+                String secondEncode = URLEncoder.encode(firstEncode, StandardCharsets.UTF_8.toString());
+                // 转为大写
+                encodedParams.put(key, secondEncode.toUpperCase());
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException("URL编码失败", e);
+            }
+        }
+        return encodedParams;
+    }
+
+    /**
+     * 生成签名字符串(key1=value1&key2=value2)
+     */
+    private static String generateSignString(List<Map.Entry<String, String>> sortedParams) {
+        StringBuilder signString = new StringBuilder();
+        for (Map.Entry<String, String> entry : sortedParams) {
+            if (signString.length() > 0) {
+                signString.append("&");
+            }
+            signString.append(entry.getKey()).append("=").append(entry.getValue());
+        }
+        return signString.toString();
+    }
+
+
+    public static String signMessage(String message, String clientSecret) throws NoSuchAlgorithmException, InvalidKeyException {
+        // 创建一个HMAC-SHA256 Mac实例
+        Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+
+        // 将clientSecret转换为密钥规范
+        SecretKeySpec secretKeySpec = new SecretKeySpec(clientSecret.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+
+        // 初始化Mac实例
+        sha256_HMAC.init(secretKeySpec);
+
+        // 计算HMAC
+        byte[] hmacBytes = sha256_HMAC.doFinal(message.getBytes(StandardCharsets.UTF_8));
+
+        // 将字节数组转换为十六进制字符串
+        return bytesToHex(hmacBytes);
+    }
+
+    /**
+     * 将字节数组转换为十六进制字符串
+     *
+     * @param bytes 要转换的字节数组
+     * @return 转换后的十六进制字符串
+     */
+    public static String bytesToHex(byte[] bytes) {
+        Formatter formatter = new Formatter();
+        for (byte b : bytes) {
+            formatter.format("%02x", b);
+        }
+        String result = formatter.toString();
+        formatter.close();
+        return result;
+    }
+
+
+}
+

+ 51 - 0
mjava/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>java-mcli</artifactId>
+        <groupId>com.malk</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <!-- mjava版本, 不同java-cli项目区分底层依赖, 使用变量有警告 -->
+    <version>0.0.3</version>
+
+    <artifactId>mjava</artifactId>
+    <description>mjava framework</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                    <!-- 如果没有该配置,devtools不会生效: 打包时关闭 -->
+                    <fork>false</fork>
+                    <!-- 避免中文乱码 -->
+                    <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+                </configuration>
+                <!-- 允许生成可运行jar: 发布作为基础包提供, 注释 executions 再执行 install 到本地 maven. 若开启即可作为独立 jar 运行 -->
+                <executions>
+                    <execution>
+                        <goals>
+                            <!--                            <goal>repackage</goal>-->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+</project>

+ 29 - 0
mjava/src/main/java/com/malk/Boot.java

@@ -0,0 +1,29 @@
+package com.malk;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+import javax.persistence.EntityManager;
+
+@EnableJpaAuditing
+@SpringBootApplication
+public class Boot {
+
+    public static void main(String... args) {
+        SpringApplication.run(Boot.class, args);
+    }
+
+    /**
+     * 让Spring管理JPAQueryFactory [多数据源配置详见DataSourceConfig]
+     *
+     * @Qualifier("entityManagerFactory") 单数据源指向
+     * @Qualifier("entityManagerFactoryPrimary") 多数据源指向
+     */
+    @Bean
+    public JPAQueryFactory jpaQueryFactory(EntityManager entityManager) {
+        return new JPAQueryFactory(entityManager);
+    }
+}

+ 29 - 0
mjava/src/main/java/com/malk/base/BaseDao.java

@@ -0,0 +1,29 @@
+package com.malk.base;
+
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @EntityListeners 且需要在启动类添加 @EnableJpaAuditing 注解, 即可在字段上添加 @CreatedDate & @LastModifiedDate 实现 [Date 类型数据 - 自动插入创建 & 更新时间]
+ * -
+ * 项目绑定数据库后,进行分配。即可消除@Table、 在 idea 下不能匹配到信息的报错提示
+ * @Table指定表【下划线和小驼峰都可】, 若使用驼峰则依然会有报错提示. 若类名从驼峰转为下划线和表名相同则可不需要注解
+ * -
+ * 自定义查询
+ * @Query 当设置nativeQuery=true即可以使用原生SQL进行查询, 默认为false, 使用JPQL语法 [JPQL不支持insert语法, 注意: nativeQuery查询使用表名, 不能使用对象名]
+ * - 索引参数: 索引值从1开始,查询中"?X"个数需要与方法定义的参数个数相一致,并且顺序也要一致
+ * - 命名参数: 可以定义好参数名,赋值时使用@Param("参数名"), 而不用管顺序. 对入参使用 @Param("email") 修饰, @Query内使用 :email 进行取值
+ * - 关于返回值: update 语法, 返回值为 void. select 语法, 返回单个可用集合接收; 若返回多个用对象接收就会异常
+ * @Modifying注解 编写JPQL实现DELETE和UPDATE操作的时候必须加上@modifying注解,以通知Spring Data 这是一个DELETE或UPDATE操作
+ * -
+ * 事务管理 @Transactional注解,可以修饰类或方法
+ * - 配置 jpa.database-platform: org.hibernate.dialect.MySQL57Dialect, JPA建表的默认引擎修改为:InNoDB
+ * - 在启动类添加 @EnableTransactionManagement 注解, 开启事务支持后,然后在访问数据库的Service方法上添加注解 @Transactional 即可 [Service指dao, 或调用dao的地方]
+ * -
+ * 动态匹配, 注解于类
+ * @DynamicInsert : 默认true,指定用于INSERT的 SQL 将会在运行时动态生成,并且只包含那些非空值字段。(如果是)
+ * @DynamicUpdate : 默认true, 指定用于UPDATE 的SQL将会在运行时动态生成,并且只更新那些改变过的字段
+ */
+public interface BaseDao extends JpaRepository<BasePo, Long> {
+
+}

+ 112 - 0
mjava/src/main/java/com/malk/base/BaseDto.java

@@ -0,0 +1,112 @@
+package com.malk.base;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+
+import java.beans.PropertyDescriptor;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 基础对象
+ *
+ * @JsonInclude(JsonInclude.Include.NON_NULL):类注解过滤null字段,包含入参和返回值【参数类搭配 @Data,才可以实例化返回值以及ToString输出】
+ * -
+ * lombok
+ * @Data : 注在类上,提供类的get、set、equals、hashCode、canEqual、toString方法
+ * @AllArgsConstructor : 注在类上,提供类的全参构造
+ * @NoArgsConstructor : 注在类上,提供类的无参构造
+ * @Setter : 注在属性上,提供 set 方法
+ * @Getter : 注在属性上,提供 getDefault 方法
+ * @EqualsAndHashCode : 注在类上,提供对应的 equals 和 hashCode 方法
+ * @Log4j/@Slf4j : 注在类上,提供对应的 Logger 对象,变量名为 log
+ * @Builder:为类生成相对略微复杂的构建器API。来初始化实例对象::类名.属性(值).属性(值).build()
+ * @Singular:在使用@Singular注释注释一个集合字段(使用@Builder注释类),lombok会将该构建器节点视为一个集合,并生成两个adder方法而不是setter方法::点一次集合增加一个元素
+ * @Builder.Default:在类中id和insertTime上都添加注解@Builder.Default,当在使用这个实体对象时,就不需要在为这两个字段进行初始化值
+ */
+@Data
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public abstract class BaseDto {
+
+    /**
+     * 对象拷贝: 若是复制一个对象, 建议使用 cloneParam 避免性能问题
+     */
+    @Deprecated
+    @SneakyThrows
+    public BaseDto copyParam() {
+        BaseDto dto = this.getClass().newInstance();
+        BeanUtils.copyProperties(this, dto);
+        return dto;
+    }
+
+    /**
+     * * todo: 4.11 继承Serializable后执行深拷贝, 不能类型转换, 不继承Serializable则返回
+     * 对象拷贝: 复制一个新的对象, 避免条件被修改, 尤其并发下分页混乱情况
+     */
+    public BaseDto cloneParam() {
+        return ObjectUtil.clone(this);
+    }
+
+    /**
+     * 对象属性合并: jda之save接口会以传入数据为准,若传入为空或不传入,更新会置空。目前解决办法两种,通过注解实现JPQL/SQL,或者查询出数据,将未传入字段属性拷贝后再更新【性能消耗】
+     */
+    public void mergeParam(BaseDto modifyDo) {
+        BeanUtils.copyProperties(this, modifyDo, getNotNullPropertyNames(modifyDo));
+    }
+
+    // 忽略有值的字段
+    private static String[] getNotNullPropertyNames(Object target) {
+        final BeanWrapper src = new BeanWrapperImpl(target);
+        PropertyDescriptor[] pds = src.getPropertyDescriptors();
+        Set<String> emptyNames = new HashSet();
+        for (PropertyDescriptor pd : pds) {
+            Object srcValue = src.getPropertyValue(pd.getName());
+            if (srcValue != null) {
+                // 此处判断可根据需求修改, 目前过滤不为null
+                emptyNames.add(pd.getName());
+            }
+        }
+        String[] result = new String[emptyNames.size()];
+        return emptyNames.toArray(result);
+    }
+
+    /**
+     * 传入映射的Map, 将实体属性和Map的key转换, 返回Map
+     */
+    public Map convertEntity(Map<String, String> reflect) {
+        Map map = JSON.parseObject(JSON.toJSONString(this, SerializerFeature.WriteNullStringAsEmpty), Map.class);
+        Map<String, String> formData = new HashMap();
+        for (String key : reflect.keySet()) {
+            String content = String.valueOf(map.get(key));
+            // json序列化已经将空字符串过滤, 若转换还有null字符串, 可能是key为null或SerializerFeature未指定到类型, 如Date
+            if (StringUtils.isNotBlank(content) && !content.equals("null")) formData.put(reflect.get(key), content);
+        }
+        return formData;
+    }
+
+
+    /**
+     * Map时间格式化, 直接从数据库取值后Map会有市区差, 方法1见BasePo, @Temporal & @JsonFormat 注解
+     * -
+     * [单独时间格式化 [废弃]]
+     * * JSON.parseArray(JSON.toJSONString(data), Map.class).stream().map(item -> {
+     * *     item.put("tStoreInTime", UtilDateTime.formatDateTime(new Date(UtilMap.getLong(item, "tStoreInTime"))));
+     * *     return item;
+     * * });
+     */
+    public static final Object jsonFormatDateTime(Object data) {
+        return JSON.parse(JSON.toJSONString(data, SerializerFeature.WriteNullStringAsEmpty, SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.WriteDateUseDateFormat));
+    }
+}

+ 64 - 0
mjava/src/main/java/com/malk/base/BasePo.java

@@ -0,0 +1,64 @@
+package com.malk.base;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 实体基类
+ *
+ * @MappedSuperclass 作为公共属性场景. 类注解, 标注后该类将不是一个完整的实体类,也不会映射到数据库表,但其的属性都将映射到其子类的数据库字段中
+ * @Cloumn java为小驼峰命名,数据库为下划线命名,若有差异,通过name指定表字段. 若相同则可不用指定name [直接设置字段值即可,无效额外注解]
+ * -
+ * 功能使用自带
+ * -
+ * @JsonFormat(pattern = "yyyy-MM-dd HH:smm:ss", timezone = "GMT+8"),数据库 Date 类型序列化后转到前台的指定格式【jackjson】
+ * @DateTimeFormat @DateTimeFormat(pattern = "yyyy-MM-dd"),使用和@jsonFormat差不多,前台传入的按照指定格式自动转为Date储存
+ * @JsonIgnoreProperties 类注解,作用是json序列化时将bean中的一些属性忽略掉,序列化和反序列化都受影响。支持多个属性 [也用于双向绑定解决循环序列化]
+ * @JsonIgnore 此注解用于属性或者方法上(最好是属性上),作用和上面的@JsonIgnoreProperties一样,屏蔽该字段在序列化和数据发挥会自动忽略
+ * @JsonGetter 用于序列化, 还可指定返回属性名,@JsonSetter 用于反序列化。注意@JsonGetter比@JsonProperty的优先级高,同时存在属性忽略会失效
+ * @Transient ORM框架将忽略该属性,不入库。如果一个属性并非数据库表的字段映射,就务必将其标示为@Transient,否则ORM框架默认其注解为@Basic
+ * @Temporal & @JsonFormat: fixme: 指定时区, new Date 会默认当前系统时区, 不添加 json 时区注解, 会出现序列化后的对象时间不是 GMT 时区 [方法2见BaseDto, jsonFormatDateTime]
+ */
+@MappedSuperclass
+@Data
+@NoArgsConstructor
+@EntityListeners(AuditingEntityListener.class)
+public abstract class BasePo extends BaseDto {
+
+    // 若是实体若不直接在 com.malk 下, 可声明继承id, 避免编辑器提示 [不加也不影响编译以及运行] [ppExt: 现有表如u8, 不继承 BaseDto, 避免默认id与时间字段匹配异常]
+    @ExcelIgnore
+    @Id
+    @JsonIgnore
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long id;
+
+    @ExcelIgnore
+    @CreatedDate
+    @Temporal(TemporalType.TIMESTAMP)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @ExcelIgnore
+    @LastModifiedDate
+    @Temporal(TemporalType.TIMESTAMP)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    public void upsert(BasePo po_old) {
+
+        if (ObjectUtil.isNotNull(po_old)) {
+            this.id = po_old.id;
+            this.setCreateTime(po_old.getCreateTime());
+        }
+    }
+}

+ 9 - 0
mjava/src/main/java/com/malk/base/BaseRepository.java

@@ -0,0 +1,9 @@
+package com.malk.base;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+
+public interface BaseRepository extends JpaRepository<BasePo, Long>, QuerydslPredicateExecutor<BasePo> {
+
+}
+

+ 78 - 0
mjava/src/main/java/com/malk/base/JpaMap.java

@@ -0,0 +1,78 @@
+package com.malk.base;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.jpa.domain.Specification;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 查询map [不指定表名]
+ * 通过Map实现, 无需定义实体, 主键设置Long即可: public interface HSViewDao extends CrudRepository<JpaMap, Long>
+ * -
+ * 使用native查询,返回Map. 直接查询表名 + 列名 + 条件, 可不做实体映射场景
+ * 时间的时区处理: 方法1见BasePo, @Temporal & @JsonFormat 注解; 方法2见BaseDto, jsonFormatDateTime
+ * 空条件jpa实现, 查询全部数据, 通过 like LTRIM('%' + ?x + '%') 进行实现 [dsl适用于复杂场景, Specification谓词需要依赖于实体]
+ * -
+ * 多条件查询
+ * 1. sql + if [SqlServer不支持if条件]
+ * * @Query(value = "select * from vwpbCommonDataOrderPlan where if (?1 is not null, dPlanDate >= ?1, 1=1) and if (?2 is not null, dPlanDate <= ?2, 1=1) and sOrderNo like LTRIM('%' + ?3 + '%')", nativeQuery = true)
+ * * Page<Map> queryOrderPlan(Date start, Date end, String sOrderNo, Pageable pageable);
+ * 2. Specification, 谓词需要依赖于实体 [参考示例, 如下 test 方法实现]
+ * - 说明
+ * 1. @Query: nativeQuery查询使用表名, 不能使用对象名
+ * 2. ppExt: 现有表如u8, 不继承 BaseDto, 避免默认id与时间字段匹配异常
+ */
+
+@Entity
+public class JpaMap {
+
+    @Id
+    private String id;
+
+    /**
+     * 时间的时区处理
+     */
+    public static final List<Map> jsonFormatDateTime(List<Map> data) {
+        return JSON.parseArray(JSON.toJSONString(data, SerializerFeature.WriteNullStringAsEmpty, SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.WriteDateUseDateFormat), Map.class);
+    }
+
+    // 示例: Specification, 谓词需要依赖于实体
+    private void test() {
+        //Page<Map> findAll (Specification < T > spec, Pageable pageable);
+
+        String sOrderNo = "";
+        Date sTime = null;
+        Date eTime = null;
+
+        Specification spec = (root, criteriaQuery, criteriaBuilder) -> {
+            List<javax.persistence.criteria.Predicate> predicates = new ArrayList<>();
+            if (StringUtils.isNotBlank(sOrderNo)) {
+                javax.persistence.criteria.Predicate predicate = criteriaBuilder.like(root.get("sOrderNo"), "%" + sOrderNo + "%");
+                predicates.add(predicate);
+            }
+
+            if (ObjectUtil.isNotNull(sTime)) {
+//            javax.persistence.criteria.Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(root.getDefault("dPlanDate").as(String.class), "2023-06-03 00:00:00");
+                javax.persistence.criteria.Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(root.get("dPlanDate"), sTime);
+                predicates.add(predicate);
+            }
+
+            if (ObjectUtil.isNotNull(eTime)) {
+                javax.persistence.criteria.Predicate predicate = criteriaBuilder.lessThanOrEqualTo(root.get("dPlanDate"), eTime);
+                predicates.add(predicate);
+            }
+            return criteriaBuilder.and(predicates.toArray(new javax.persistence.criteria.Predicate[predicates.size()]));
+            /// 或
+            ///return criteriaQuery.where(predicates.toArray(new javax.persistence.criteria.Predicate[predicates.size()])).getRestriction();
+        };
+    }
+}

+ 35 - 0
mjava/src/main/java/com/malk/config/JpaConfiguration.java

@@ -0,0 +1,35 @@
+package com.malk.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+/**
+ * JPA [错误抛出与拦截详见CatchException, 多数据源配置参考DataSourceConfig]
+ * -
+ * 1. 关键字语法: save find, exists, count [单表操作 - 若数据库列和对象属性字段一致, 直接使用 jpa 自带查询匹配不到启动报错]
+ * 2. 自定义查询: @Query, 通过 nativeQuery 区分 jpql 和 sql 语法 [简单查询]
+ * 3. 表关联关系: @OneToMany, @ManyToOne, @ManyToMany, @OneToOne [耦合关联]
+ * 4. Specification: Predicate 与 CriteriaBuilder 组合 [谓词, 需要依赖于实体]
+ * 5. QueryDSL: 基于ORM框架以及SQL之上的一个通用的查询框架, 分页, 关联查询原生支持 [查询框架] (通过查询关联, 而不是如 @OneToMany 等建立表关联)
+ * 6. DSL: 项目在 compile 会执行 apt-maven-plugin 插件, 将 @Entity 注解类, 添加 Q 前缀, 存放到 target 下 generated-source 目录
+ * 7. 配置: 扫描基础路径, 涉及子项目也能注册到, 避免启动报错. 子项目 Boot 配置 @SpringBootApplication(scanBasePackages = {"com.mcli"})
+ * 8. 查询: 使用native,查询列不匹配实体属性,会报错The column name xxx is not valid,返回Map可解决 (Map是Jpa的TupleBackedMap, 通过try取值)
+ * 9. 单数据源切换: 在dao与entity均添加mutual作为公共模块, 单数据源下服务于JpaConfiguration, 若是多数据源与PrimaryConfig一起作为主数据源配置
+ * 10 主子项目, 在单数据源情况下, 扫描全部. [需要注意的是, 在多数据源下同名dao是可以通过指定数据源使用, 此时若开启单数据源启动报错, 会扫描全部]
+ */
+@ConditionalOnProperty(name = "spel.multiSource", havingValue = "false")
+@Configuration
+// 单数据源, 扫描子项目与主项目primary [子项目可以访问到主项目primary]
+@EnableJpaRepositories(basePackages = {"com.malk.*.repository.dao", "com.malk.repository.dao.primary"})
+@EntityScan(basePackages = {"com.malk.*.repository.entity", "com.malk.repository.entity.primary"})
+public class JpaConfiguration {
+
+    @Bean
+    PersistenceExceptionTranslationPostProcessor persistenceExceptionTranslationPostProcessor() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+}

+ 58 - 0
mjava/src/main/java/com/malk/config/WebConfiguration.java

@@ -0,0 +1,58 @@
+package com.malk.config;
+
+import com.malk.filter.RequestInterceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+    // 指定类输出日志到指定文件夹
+    private static final Logger logger = LoggerFactory.getLogger("point");
+
+    // 请求拦截
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        logger.info("拦截器 ▷ 初始化");
+        registry.addInterceptor(new RequestInterceptor())
+                .addPathPatterns("/**")
+                // ppExt: 若无需对外访问, 不用添加路径. static/public 为默认
+                .excludePathPatterns("/assets/**", "/templates/**");
+    }
+
+    // 跨域支持: 端口不匹配也会报跨域, 若是单个控制器开放, 可使用 @CrossOrigin 注解
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        logger.info("拦截器 ▷ 开启CORS");
+        registry.addMapping("/**")  // 添加映射路径
+                .allowedOrigins("*")  // 放行哪些原始
+                .allowCredentials(true)  // 是否发送Cookie信息
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH")  // 放行哪些原始域(请求方式)
+                .allowedHeaders("*")  // 放行哪些原始域(头部信息)
+                .allowCredentials(true);  // 放行证书
+    }
+
+    /**
+     * 静态资源映射
+     * -
+     * 默认的静态资源路径为: classpath:/META-INF/resources/, classpath:/resources/,classpath:/static/, classpath:/public [默认路径不会进拦截器]
+     * 读取的是target内容, 访问路径 assets: http://localhost:9001/api/assets/logo/logo-text.png [自定义拦截器添加路径排除: excludePathPatterns]
+     * web网页路径: http://localhost:9011/api/项目路径/web2/index.html#/模块名称/home [前后端模块化, 不配置Nginx从Tomcat透出vue页面]
+     * 当在SpringBoot项目内添加网页资源时,在windows服务器,需要C:\Windows\System32下添加tomcat-native-1.2.14-win32-bin.zip内x64下两个文件, 重启项目
+     * -
+     * ppExt: ClassPathResource, 需要打包/编译后才能访问到. 识别不是架包内内容 [static 可自动过滤, 自动识别子文件夹作为 path]
+     * [两个示例]: mjs http://localhost:9001/api/项目路径/mjs/mjs.min.js / http://localhost:9001/api/项目路径/json/personnel.json
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+        registry.addResourceHandler("/web2/**").addResourceLocations("classpath:/static/web2/");
+        registry.addResourceHandler("/assets/**").addResourceLocations("classpath:/assets/");
+        registry.addResourceHandler("/templates/**").addResourceLocations("classpath:/templates/");
+    }
+}

+ 41 - 0
mjava/src/main/java/com/malk/config/mutilSource/DataSourceConfig.java

@@ -0,0 +1,41 @@
+package com.malk.config.mutilSource;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据源配置
+ * -
+ * AOP多数据源切换:
+ * - 1. pom文件添加spring-boot-starter-jdbc依赖
+ * - 2. yml配置多主从数据库, 数据库地址从url修改为jdbc-url
+ * - 3. 通过spel.multiSource控制是否多数据源, 屏蔽JpaConfiguration, 加载DataSourceConfig
+ * 不同数据源存在同名表:
+ * - 1. 实体只需要在dao层区分即可, 作用域下实体包路径是不同的
+ * - 2. 同名的dao通过@Repository("slaveMcTableDao")定义区分; 在Autowired引用时候属性上添加@Qualifier("slaveMcTableDao")注解
+ * -
+ * 单数据源切换: 在dao与entity均添加mutual作为公共模块, 单数据源下服务于JpaConfiguration, 若是多数据源与PrimaryConfig一起作为主数据源配置
+ */
+@ConditionalOnProperty(name = "spel.multiSource", havingValue = "true")
+@Configuration
+public class DataSourceConfig {
+
+    @Bean(name = "primaryDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.primary")
+    @Primary
+    public DataSource primaryDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "slaveDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.slave")
+    public DataSource slaveDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+}

+ 80 - 0
mjava/src/main/java/com/malk/config/mutilSource/PrimaryConfig.java

@@ -0,0 +1,80 @@
+package com.malk.config.mutilSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 主数据源配置,多数据源必须设置一个主数据源, 通过 @Primary 注解 [包含公共部分]
+ * -
+ * 主子项目, 在多数据源情况下, 子项目需要匹配主项目目录结构, 且符合命名规范. 配置对应扫描 EnableJpaRepositories / EntityScan 添加子项目路径
+ */
+@ConditionalOnProperty(name = "spel.multiSource", havingValue = "true")
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+        entityManagerFactoryRef = "entityManagerFactoryPrimary", // 配置连接工厂 entityManagerFactory
+        transactionManagerRef = "transactionManagerPrimary", // 配置事物管理器  transactionManager
+        basePackages = {"com.malk.repository.dao.primary", "com.malk.*.repository.dao.primary", "com.malk.base"}  // dao层配置主数据 & 公共所在目录 [子项目可以访问到主项目primary]
+)
+public class PrimaryConfig {
+
+    @Autowired
+    @Qualifier("primaryDataSource")  // 指定这是主数据源,为了和从(其他)数据源区别开,因为@Autowired不能导入名称相同的是bean
+    private DataSource dataSourcePrimary;
+
+    @Autowired
+    private JpaProperties jpaProperties;
+
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    @Primary
+    @Bean("entityManagerPrimary")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
+        return Objects.requireNonNull(entityManagerFactoryBean(builder).getObject()).createEntityManager();
+    }
+
+    @Primary
+    @Bean("entityManagerFactoryPrimary")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean(EntityManagerFactoryBuilder builder) {
+        return builder.dataSource(dataSourcePrimary)
+                .properties(getVendorProperties())
+                // 设置实体类所在目录: 包含主数据源与公共 [子项目可以访问到主项目primary]
+                .packages("com.malk.repository.entity.primary", "com.malk.*.repository.entity.primary", "com.zhuogao.base")
+                // 持久化单元名称,当存在多个EntityManagerFactory时,需要制定此名称
+                .persistenceUnit("primaryPersistenceUnit")
+                .build();
+    }
+
+    private Map<String, Object> getVendorProperties() {
+        return hibernateProperties.determineHibernateProperties(
+                jpaProperties.getProperties(),
+                new HibernateSettings()
+        );
+    }
+
+    @Primary
+    @Bean("transactionManagerPrimary")
+    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
+        return new JpaTransactionManager(Objects.requireNonNull(entityManagerFactoryBean(builder).getObject()));
+    }
+}
+

+ 76 - 0
mjava/src/main/java/com/malk/config/mutilSource/SlaveConfig.java

@@ -0,0 +1,76 @@
+package com.malk.config.mutilSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 从数据源配置
+ * -
+ * 主子项目, 在多数据源情况下, 子项目需要匹配主项目目录结构, 且符合命名规范. 配置对应扫描 EnableJpaRepositories / EntityScan 添加子项目路径
+ */
+@ConditionalOnProperty(name = "spel.multiSource", havingValue = "true")
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(
+        entityManagerFactoryRef = "entityManagerFactorySlave",
+        transactionManagerRef = "transactionManagerSlave",
+        basePackages = {"com.malk.repository.dao.slave", "com.malk.*.repository.dao.slave"} // slave无公共类, 需单独添加 [子项目可以访问到主项目primary]
+)
+public class SlaveConfig {
+
+    @Autowired
+    @Qualifier("slaveDataSource")
+    private DataSource dataSourceSlave;
+
+    @Autowired
+    private JpaProperties jpaProperties;
+
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    @Bean("entityManagerSlave")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
+        return Objects.requireNonNull(localContainerEntityManagerFactoryBean(builder).getObject()).createEntityManager();
+    }
+
+    @Bean("entityManagerFactorySlave")
+    public LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean(EntityManagerFactoryBuilder builder) {
+        return builder.dataSource(dataSourceSlave)
+                .properties(getVendorProperties())
+                // 设置实体类所在目录 [slave无公共类, 需单独添加, 如 JpaMapSlave]
+                .packages("com.malk.repository.entity.slave", "com.malk.*.repository.entity.slave")
+                // 持久化单元名称,当存在多个EntityManagerFactory时,需要制定此名称
+                .persistenceUnit("slavePersistenceUnit")
+                .build();
+    }
+
+    private Map<String, Object> getVendorProperties() {
+        return hibernateProperties.determineHibernateProperties(
+                jpaProperties.getProperties(),
+                new HibernateSettings()
+        );
+    }
+
+    @Bean("transactionManagerSlave")
+    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
+        return new JpaTransactionManager(Objects.requireNonNull(localContainerEntityManagerFactoryBean(builder).getObject()));
+    }
+}
+

+ 73 - 0
mjava/src/main/java/com/malk/controller/DDCallbackController.java

@@ -0,0 +1,73 @@
+package com.malk.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.malk.server.common.McR;
+import com.malk.server.dingtalk.DDConf;
+import com.malk.server.dingtalk.crypto.DingCallbackCrypto;
+import com.malk.service.dingtalk.DDClient_Event;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 钉钉事件回调 3_1
+ * -
+ * [子项目直接继承即可有调用, 无需实现]
+ * -
+ * 注解 @RequestMapping 路径不能重复 [主子项目属同一个项目];
+ * 获取项目回调请求地址, https://mc.cloudpure.cn/frp/mc/dd/callback [调试代理: frp + nginx]
+ */
+@Slf4j
+@RestController
+@RequestMapping("/mc/dd")
+public class DDCallbackController {
+
+    @Autowired
+    private DDConf ddConf;
+
+    @Autowired
+    private DDClient_Event ddClient_event;
+
+    /**
+     * 钉钉审批回调: [依赖包方案已弃用]
+     * -
+     * DingCallbackCrypto 方案: 官网案例 DingCallbackCrypto 不在钉钉架包, 需要单独引用
+     * 在钉钉开放平台重新保存回调地址后, 所有的注册事件会被关闭:: 通过代码注册不成功; 官方回复, 要么使用调用注册的方式 要么是后台的方式, 二选一
+     */
+    @SneakyThrows
+    @RequestMapping(value = "/callback", method = RequestMethod.POST)
+    public Map<String, String> invokeCallback(@RequestParam(value = "signature", required = false) String signature,
+                                              @RequestParam(value = "timestamp", required = false) String timestamp,
+                                              @RequestParam(value = "nonce", required = false) String nonce,
+                                              @RequestBody(required = false) JSONObject json) {
+
+        DingCallbackCrypto callbackCrypto = new DingCallbackCrypto(ddConf.getToken(), ddConf.getAesKey(), ddConf.getAppKey());
+        final String decryptMsg = callbackCrypto.getDecryptMsg(signature, timestamp, nonce, json.getString("encrypt"));
+        JSONObject eventJson = JSON.parseObject(decryptMsg);
+        Map success = callbackCrypto.getEncryptedMap(DDConf.CALLBACK_RESPONSE, System.currentTimeMillis(), DingCallbackCrypto.Utils.getRandomStr(8));
+        String eventType = eventJson.getString("EventType");
+        if (DDConf.CALLBACK_CHECK.equals(eventType)) {
+            log.info("----- [DD]验证注册 -----");
+            return success;
+        }
+        // [回调任务执行逻辑: 异步] 钉钉超时3s未返回会被记录为失败, 可通过失败接口获取记录
+        if (Arrays.asList(DDConf.BPMS_INSTANCE_CHANGE, DDConf.BPMS_TASK_CHANGE).contains(eventType)) {
+            log.info("[DD]审批回调, {}", eventJson);
+            ddClient_event.callBackEvent_Workflow(eventJson);
+            return success;
+        }
+        log.info("----- [DD]已注册, 未处理的其它回调 -----, {}", eventJson);
+        return success;
+    }
+
+    @PostMapping("robot")
+    McR robot(@RequestBody Map data) {
+        log.info("xxx, {}", data);
+        return McR.success();
+    }
+}

+ 61 - 0
mjava/src/main/java/com/malk/controller/TBCallBackController.java

@@ -0,0 +1,61 @@
+package com.malk.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.malk.delegate.TBEvent;
+import com.malk.server.teambition.TBConf;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+/**
+ * TB事件回调 3_1
+ * 1. 回调可选择加密与不加密方式, tb发送成功为上游, 注册服务为下游
+ * 2. 绑定回调需要安装后才会生效, 且回调范围更新后需要重新安装才会生效 [另外接口调用修改配置需要重新发布后生效]
+ */
+@Slf4j
+@RestController
+@RequestMapping("/mc/tb")
+public class TBCallBackController {
+
+    @Autowired
+    private TBEvent tbEvent;
+
+    /**
+     * * 回调说明 [ppExt: 字段更新回调, 判定字段ID, 避免循坏触发问题, 接口修改也会触发webhook]
+     * * 1. 通过接口更操作的数据,也会与手动创建一样触发相同的回调, 除了项目更新接口调用实测不会触发回调, 手动修改正常回调
+     * * 2. 项目创建会推送两次
+     * * - 1. 在第二次推送多 { data: { project: { operatorId, url }} } 这两个字段内容
+     * * - 2. 若是通过模板创建的项目,在两次项目更新回调中会回调一次 project.enable 回调, 其中任务只会回调创建, 不会回调更新
+     * * 3. 任务创建, 会先回调创建事件, 接着立即回调任务更新事件 [若是通过模板创建, 任务只会回调创建, 不会回调更新]
+     * * 4. 项目移入回收站,不会触发回调,删除后会触发项目与任务的 remove 事件; 若是将任务移入回收站, 会触发任务更新回调
+     */
+    @PostMapping("callback")
+    public String callback(@RequestBody JSONObject eventJson) {
+
+        String success = "success";
+        String eventName = eventJson.getString("event");
+
+        if (TBConf.EVENT_VERIFY_HOOK.equals(eventName)) {
+            log.info("----- [TB]验证注册 -----");
+            return success;
+        }
+
+        if (eventName.contains("task")) {
+            log.info("[TB]任务回调, {}, {}", eventName, eventJson);
+            tbEvent.callBackTask(eventJson);
+            return success;
+        }
+
+        if (eventName.contains("project")) {
+            log.info("[TB]项目回调, {}, {}", eventName, eventJson);
+            tbEvent.callBackProject(eventJson);
+            return success;
+        }
+
+        log.info("----- [TB]已注册, 未处理的其它回调 -----, {}, {}", eventName, eventJson);
+        return success;
+    }
+}

+ 101 - 0
mjava/src/main/java/com/malk/core/AsyncConfig.java

@@ -0,0 +1,101 @@
+package com.malk.core;
+
+//import com.mcli.filter.ExceptionNotice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 线程池配置 [函数式编程:详见YDClient/YDService使用说明]
+ * -
+ * 前提: 1. 必须仅适用于 public 实例方法; 2.在同一个类中调用异步方法将无法正常工作(self-invocation); 3. 访问对象必须通过 @Autowired 进行注入, 否则无效
+ * 返回: 1. 一般为 void, 若需要返回值, 使用Future. 2. 不建议使用回调函数: 回调函数没有状态, 若执行过程中出现数据增删, 简单的通过数量判断不可取 [YDService]
+ * 备注: 开启异步在配置类添加 @EnableAsync 类注解, 无需在启动类添加 [非必要]
+ * 扩展:
+ * - 1. 可以搭配 lombok 的 @Synchronized, 实现异步情况下的线程安全. 会等到前一次执行成功后执行后一次线程调用 [若是不使用 @Async, 可能会超时失败, 宜搭不稳定]
+ * - 2. 指定线程 @Async("aliworkConcurrence") 配置, 统一配置调用上限避免超并发 [宜搭, YDClient内并发公共一个@Async配置]
+ */
+@Slf4j
+@Configuration
+@EnableAsync
+public class AsyncConfig implements AsyncConfigurer {
+
+    // 指定类输出日志到指定文件夹
+    private static final Logger logger = LoggerFactory.getLogger("point");
+
+//    @Autowired
+//    private ExceptionNotice notice;
+
+    /**
+     * 异步执行配置
+     *
+     * @async 更建议是为了实现异步, 若有并发等待也可满足
+     * Delayed 函数回调存在线程死锁, 导致内存问题, 已弃用
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        logger.info("asyncExecutor ▷ 多线程执行");
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();  // 定义线程池
+        taskExecutor.setCorePoolSize(3);  // 设置核心线程
+        taskExecutor.setMaxPoolSize(10);  // 设置最大线程
+        taskExecutor.setQueueCapacity(200);  // 设置线程队列最大线程数
+        taskExecutor.setKeepAliveSeconds(10);  // 允许线程的空闲时间 [勿动]
+        taskExecutor.setThreadNamePrefix("async-executor-");  // 线程池名的前缀
+        taskExecutor.initialize();  // 初始化
+        return taskExecutor;
+    }
+
+    /**
+     * 并发线程配置: 宜搭 [统一配置调用上限避免超过并发, YDClient内并发公共一个@Async配置]
+     *
+     * @Async("aliworkConcurrence") 指定线程
+     */
+    @Bean("aliworkConcurrence")
+    public ThreadPoolTaskExecutor aliworkTaskExecutor() {
+        logger.info("aliworkConcurrence ▷ 多线程初始化");
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        // 核心线程数:线程池创建时候初始化的线程数 ==> 宜搭并发200次/s, 限流配置 [4核偶尔出现, 3核极其偶尔]
+        executor.setCorePoolSize(2);
+        // 最大线程数:线程池最大的线程数,只有在缓冲队列满了之后才会申请超过核心线程数的线程
+        executor.setMaxPoolSize(2);
+        // 缓冲队列:用来缓冲执行任务的队列
+        executor.setQueueCapacity(200);
+        // 允许线程的空闲时间60秒:当超过了核心线程之外的线程在空闲时间到达之后会被销毁
+        executor.setKeepAliveSeconds(60);
+        // 线程池名的前缀:设置好了之后可以方便我们定位处理任务所在的线程池
+        executor.setThreadNamePrefix("aliwork-concurrence-");
+        // 缓冲队列满了之后的拒绝策略:由调用线程处理(一般是主线程)
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy());
+        executor.initialize();
+        return executor;
+    }
+
+    /**
+     * 处理异步方法中未捕获的异常
+     * -
+     * ppExt 重要声明
+     * 1. @Async 内若调用了不能并发的方法, 如查询限流, 需要在调用的方法上添加 @Synchronized, 避免异步情况下执行触发限流导致抛出错误到多线程
+     * 2. @Async 方法上建议要添加 @Synchronized, 否则就在多次连续调用的时候, 入参需要做拷贝, 若同一个入参对象连续调用 @Async 会读取最后一次赋值
+     */
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return (ex, method, params) -> {
+            log.error("Async反馈异常 {}. {}. {}", ex, method, params);  // 记录错误日志
+            try {
+                throw ex;
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
+            }
+        };
+    }
+}

+ 36 - 0
mjava/src/main/java/com/malk/delegate/DDEvent.java

@@ -0,0 +1,36 @@
+package com.malk.delegate;
+
+import org.springframework.scheduling.annotation.Async;
+
+/**
+ * 钉钉事件回调 3_2
+ * -
+ * [主项目若无实现, 项目启动异常; 若子项目有订阅需添加 @Primary 以实现优先注入]
+ * -
+ * 子项目实现接口 [静态代理], 添加对应 processCode 单据业务逻辑
+ * OA审批, 撤销和拒绝流程不继续执行连接器, 通过事件订阅实现实时同步
+ */
+public interface DDEvent {
+
+
+    // todo, 回调做try, 失败记录做存储, 提供查询接口
+
+    // todo, 回调参数统一, 宜搭查询接口统一
+
+    // 审批任务回调执行业务逻辑
+    @Async
+    void executeEvent_Task_Finish(String processInstanceId, String processCode, boolean isAgree, String remark);
+
+    @Async
+    void executeEvent_Task_Start(String processInstanceId, String processCode);
+
+    @Async
+    void executeEvent_Task_Redirect(String processInstanceId, String processCode);
+
+    // 审批实例回调执行业务逻辑
+    @Async
+    void executeEvent_Instance_Finish(String processInstanceId, String processCode, boolean isAgree, boolean isTerminate, String staffId);
+
+    @Async
+    void executeEvent_Instance_Start(String processInstanceId, String processCode);
+}

+ 17 - 0
mjava/src/main/java/com/malk/delegate/McDelegate.java

@@ -0,0 +1,17 @@
+package com.malk.delegate;
+
+import org.springframework.scheduling.annotation.Async;
+
+public interface McDelegate {
+
+    /**
+     * 异步线程回调
+     */
+    @Async
+    void setTimeout(Invoke fn, long millis);
+
+    @FunctionalInterface
+    interface Invoke {
+        void execute();
+    }
+}

+ 25 - 0
mjava/src/main/java/com/malk/delegate/TBEvent.java

@@ -0,0 +1,25 @@
+package com.malk.delegate;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * TB事件回调 3_2
+ * -
+ * [主项目若无实现, 项目启动异常; 若子项目有订阅需添加 @Primary 以实现优先注入]
+ * -
+ * 子项目实现接口 [静态代理], 添加对应 processCode 单据业务逻辑
+ */
+public interface TBEvent {
+
+    /**
+     * 任务回调事件  [异步]
+     * ppExt
+     * 1. 若存在前后置, 未完成子任务, 点击完成TB会自动切换为未完成, 此种状态下不会触发任务回调
+     */
+    void callBackTask(JSONObject eventJson);
+
+    /**
+     * 项目回调事件  [异步]
+     */
+    void callBackProject(JSONObject eventJson);
+}

+ 49 - 0
mjava/src/main/java/com/malk/delegate/impl/DDImplEvent.java

@@ -0,0 +1,49 @@
+package com.malk.delegate.impl;
+
+import com.malk.delegate.DDEvent;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+/**
+ * OA审批事件 [主项目若无实现, 项目启动异常; 若子项目有订阅需添加 @Primary 以实现优先注入]
+ * -
+ * 取消方案: 撤销和拒绝流程不继续执行连接器, 因此不使用连接器与轮询审批记录方案 [低效而且占用较高钉钉api调次数];
+ * 优化方案: 通过事件订阅实现实时同步所有审批状态, 定时查询钉钉回调失败记录 [配置钉钉事件Delegate, 添加定时任务]
+ */
+@Slf4j
+@Service
+public class DDImplEvent implements DDEvent {
+
+    // 审批任务回调执行业务逻辑
+    @Async
+    @Override
+    public void executeEvent_Task_Finish(String processInstanceId, String processCode, boolean isAgree, String remark) {
+        log.info("executeEvent_Task_Finish: 未被代理");
+    }
+
+    @Async
+    @Override
+    public void executeEvent_Task_Start(String processInstanceId, String processCode) {
+        log.info("executeEvent_Task_Start: 未被代理");
+    }
+
+    @Async
+    @Override
+    public void executeEvent_Task_Redirect(String processInstanceId, String processCode) {
+        log.info("executeEvent_Task_Redirect: 未被代理");
+    }
+
+    @Async
+    @Override
+    public void executeEvent_Instance_Start(String processInstanceId, String processCode) {
+        log.info("executeEvent_Instance_Start: 未被代理");
+    }
+
+    // 审批实例回调执行业务逻辑
+    @Async
+    @Override
+    public void executeEvent_Instance_Finish(String processInstanceId, String processCode, boolean isAgree, boolean isTerminate, String staffId) {
+        log.info("executeEvent_Instance_Finish: 未被代理");
+    }
+}

+ 21 - 0
mjava/src/main/java/com/malk/delegate/impl/McImplDelegate.java

@@ -0,0 +1,21 @@
+package com.malk.delegate.impl;
+
+import com.malk.delegate.McDelegate;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class McImplDelegate implements McDelegate {
+
+    @SneakyThrows
+    @Async
+    @Override
+    public void setTimeout(Invoke fn, long millis) {
+
+        Thread.sleep(millis);
+        fn.execute();
+    }
+}

+ 29 - 0
mjava/src/main/java/com/malk/delegate/impl/TBImplEvent.java

@@ -0,0 +1,29 @@
+package com.malk.delegate.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.malk.delegate.TBEvent;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class TBImplEvent implements TBEvent {
+
+    @Async
+    @Override
+    @SneakyThrows
+    public void callBackTask(JSONObject eventJson) {
+        String eventName = eventJson.getString("event");
+        log.info("callBackTask: 未被代理");
+    }
+
+    @Async
+    @Override
+    @SneakyThrows
+    public void callBackProject(JSONObject eventJson) {
+        String eventName = eventJson.getString("event");
+        log.info("callBackProject: 未被代理");
+    }
+}

+ 215 - 0
mjava/src/main/java/com/malk/filter/CatchException.java

@@ -0,0 +1,215 @@
+package com.malk.filter;
+
+import com.alibaba.fastjson.JSONException;
+import com.malk.server.common.McException;
+import com.malk.server.common.McR;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
+import org.springframework.validation.FieldError;
+import org.springframework.web.HttpMediaTypeNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+
+import javax.validation.ConstraintDeclarationException;
+import javax.validation.ConstraintViolationException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 统一错误拦截
+ * -
+ * 参数校验 @Validated【javax.validation】
+ * 1. @Validated 针对实体类进行字段入参校验,可做分组,实现不同接口请求下字段的校验规则
+ * 2. @RestControllerAdvice 搭配 @ExceptionHandler 注解进行错误统一捕获和拦截返回,无需 try…catch 即可格式化返回标准输出::注意类名
+ * 3. 若无分组验证需求,可将@Validated 置于类上,不需要在@requestBody前声明。分组验证,可以在实体类组合好,若是取并集,则可直接在@requestBody上设置多个即可
+ * -
+ * 拦截param自定义message: @RequestParam默认是required,若想使用该检验,请求方法无需添加@RequestParam,且需要在Controller上添加@Validated
+ * 参数@RequestParam,可以配置默认值,指定name,指定name后可以设置是否必填。若是要获取所有(@RequestParam MultiValueMap<String, String> paramMap),每一个字段的值是一个集合
+ * -
+ * 关于在Service上使用校验, 首先需要impl类上添加@Validated [和Controller一致]
+ * 建议注解到方法声明上, 抛出到ConstraintViolationException. 若校验注解到方法实现上, 则错误抛出到 ConstraintDeclarationException, 没有友好的提示
+ * -
+ * -
+ * 若入参是Body,需要使用@RequestBody解析到实体/Map内,校验错误抛出到MethodArgumentNotValidException。@RequestBody @Validated({YDParam.Retrieve_Condition.class}) YDParam param
+ * 如入参是formData,不能使用@RequestBody,参数会自动解析到实体; 若不是实体则需要通过方法转Map, 错会抛出到BindException. @Validated({YDParam.Retrieve_Condition.class}) YDParam param
+ * -
+ * 使用@RestController后,请求方法无需再使用@RequestBody,@RequestParam,直接可对入参进行修饰,效果类似解构,除了正常获取HttpServletRequest外,相关参数自动处理到注解内
+ * RESTFul 风格接口, 参数获取方式均相同, GET 没有 body, @PathVariable 获取 url 占位符, RequestParam 获取 url 参数, @RequestBody 获取 body 数据
+ * -
+ * 关于入参为JSONString类型: body内的json需要传入字符串, 若为对象会解析报错. 若是formData, 传入对象会自动转为字符串, 不会解析错误, 无需转为JSONString
+ * 注解@JsonInclude(JsonInclude.Include.NON_NULL):类注解过滤null字段,包含入参和返回值【参数类搭配 @Data,才可以实例化返回值以及ToString输出】
+ */
+@Slf4j
+@RestControllerAdvice(annotations = RestController.class)
+public class CatchException<T> {
+
+//    @Autowired
+//    private ExceptionNotice notice;
+
+    /**
+     * 通用错误类抛出
+     */
+    @ExceptionHandler(McException.class)
+    public McR McException(McException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.R(e.isSuccess(), e.getCode(), e.getMessage(), null, e.getSource());  // IGNORE_EXECUTE 为成功
+    }
+
+    /**************** validated不合法 ****************/
+
+    /**
+     * @validated 验证入参对象 @Validated({YDParam.Retrieve_Condition.class}) YDParam param
+     * -
+     * 如入参是formData,不能使用@RequestBody,参数会自动解析到实体; 若不是实体通过方法转Map .报错会抛出到BindException。@Validated({YDParam.Retrieve_Condition.class}) YDParam param
+     */
+    @ExceptionHandler(value = BindException.class)
+    public McR BindException(BindException e) {
+        List errorParam = new ArrayList();
+        e.getFieldErrors().forEach(fieldError -> {
+            errorParam.add(fieldError.getField() + ": " + fieldError.getDefaultMessage());
+        });
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("formData参数 -> " + String.join(", ", errorParam));
+    }
+
+    /**
+     * @Validated 关于在Service上使用校验,
+     * -
+     * 首先需要impl类上添加@Validated [和Controller一致]
+     * 建议注解到方法声明上, 抛出到ConstraintViolationException. 若校验注解到方法实现上, 则错误抛出到 ConstraintDeclarationException, 没有友好的提示
+     */
+    @ExceptionHandler(ConstraintDeclarationException.class)
+    public McR ConstraintDeclarationException(ConstraintDeclarationException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("param参数 -> " + e.getMessage());
+    }
+
+    /**
+     * @validated 验证入参字段 @NotNull(message = "cur不能为空") String cur
+     * -
+     * 若入参是Body,需要使用@RequestBody解析到实体内,校验错误抛出到MethodArgumentNotValidException。@RequestBody @Validated({YDParam.Retrieve_Condition.class}) YDParam param
+     * 如入参是formData,不能使用@RequestBody,参数会自动解析到实体; 若不是实体通过方法转Map .报错会抛出到BindException。@Validated({YDParam.Retrieve_Condition.class}) YDParam param
+     * 关于入参为JSONString类型: body内的json需要传入字符串, 若为对象会解析报错. 若是formData, 传入对象会自动转为字符串, 不会解析错误, 无需转为JSONString
+     */
+    @ExceptionHandler(ConstraintViolationException.class)
+    public McR ConstraintViolationException(ConstraintViolationException e) {
+        List errorParam = new ArrayList();
+        e.getConstraintViolations().forEach(fieldError -> {
+            errorParam.add(fieldError.getPropertyPath() + ": " + fieldError.getMessage());
+        });
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("param参数 -> " + String.join(", ", errorParam));
+    }
+
+    /**
+     * @validated 验证入参对象 @RequestBody @Validated({YDParam.Retrieve_Condition.class}) YDParam param
+     * -
+     * 若入参是Body,需要使用@RequestBody解析到实体内,校验错误抛出到MethodArgumentNotValidException。@RequestBody @Validated({YDParam.Retrieve_Condition.class}) YDParam param
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public McR MethodArgumentNotValidException(MethodArgumentNotValidException e) {
+        List errorParam = new ArrayList();
+        e.getBindingResult().getAllErrors().forEach(err -> {
+            FieldError fieldError = (FieldError) err;
+            errorParam.add(fieldError.getField() + ": " + fieldError.getDefaultMessage());
+        });
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("body参数 -> " + String.join(", ", errorParam));
+    }
+
+    /**************** 请求参数异常 ****************/
+
+    /**
+     * @RequestParam默认是required 验证入参字段 @RequestParam String cur
+     * -
+     * 参数@RequestParam,可以配置默认值,指定name,指定name后可以设置是否必填。若是要获取所有(@RequestParam MultiValueMap<String, String> param
+     */
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    public McR MissingServletRequestParameterException(MissingServletRequestParameterException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("param参数 -> " + e.getMessage());
+    }
+
+    /**
+     * @RequestParam 参数类型解析异常
+     */
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    public McR MethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("param参数 ->  " + e.getName() + "不合法: " + e.getMessage());
+    }
+
+    /**
+     * @RequestBody 序列化字段为非Sting类型
+     * -
+     * 关于入参为JSONString类型: body内的json需要传入字符串, 若为对象会解析报错. 若是formData, 传入对象会自动转为字符串, 不会解析错误, 无需转为JSONString
+     */
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public McR HttpMessageNotReadableException(HttpMessageNotReadableException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        if (e.getMessage().contains("Required request body is missing")) {
+            return McR.errorParam("请求体参数不能为空");
+        }
+        return McR.errorParam("请求体参数格式不合法");
+    }
+
+    /**
+     * Content-Type不合法
+     */
+    @ExceptionHandler(HttpMediaTypeNotSupportedException.class)
+    public McR HttpMediaTypeNotSupportedException(HttpMediaTypeNotSupportedException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("Content-Type不合法: " + e.getMessage());
+    }
+
+    /**************** 网络请求异常 ****************/
+
+    /**
+     * http请求返回json解析异常
+     */
+    @ExceptionHandler(JSONException.class)
+    public McR JSONException(JSONException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("返回JSON解析异常: " + e.getMessage());
+    }
+
+    /**************** 数据类型异常 ****************/
+
+    /**
+     * BigDecimal 非数值型字符串, 空字符串取值异常
+     */
+    @ExceptionHandler(NumberFormatException.class)
+    public McR NumberFormatException(NumberFormatException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam(e.getMessage() + ": 非数值型字符串, 空字符串取值异常");
+    }
+
+    /**
+     * 反射未匹配到路径
+     */
+    @ExceptionHandler(ClassNotFoundException.class)
+    public McR ClassNotFoundException(ClassNotFoundException e) {
+        log.error(e.getMessage(), e);  // 记录错误日志
+        return McR.errorParam("反射未匹配到路径: " + e.getMessage());
+    }
+
+    /**
+     * 系统错误抛出
+     * -
+     * NOTE: 空指针判定, 日志目前会记录在warn内, 不输出到error内, 做一层包装返回 (空指针message为null)
+     */
+    @ExceptionHandler(Exception.class)
+    public McR Exception(Exception e) {
+        log.error(e.getMessage(), e);       // 记录错误日志
+//        notice.noticeErrorByDingtalk(e);    // 上报错误日志
+        if (e instanceof NullPointerException) {
+            return McR.errorNullPointer();
+        }
+        return McR.errorUnknown(e.getMessage());
+    }
+}

+ 53 - 0
mjava/src/main/java/com/malk/filter/ExceptionNotice.java

@@ -0,0 +1,53 @@
+//package com.mcli.filter;
+//
+//import cn.hutool.core.util.ObjectUtil;
+//import com.alibaba.fastjson.JSONObject;
+//import com.mcli.com.mcli.mcli.utils.UtilDateTime;
+//import com.mcli.service.common.McConf;
+//import com.mcli.service.common.McException;
+//import com.mcli.service.dingtalk.DDConf;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.Date;
+//
+///**
+// * 报错消息: 发送钉钉工作通知
+// */
+//@Slf4j
+//@Component
+//public class ExceptionNotice {
+//
+//    @Autowired
+//    private DDClient ddClient;
+//
+//    @Autowired
+//    private DDConf ddConf;
+//
+//    @Autowired
+//    private McConf mcConf;
+//
+//    /**
+//     * 上报错误日志 [未知错误]
+//     */
+//    public void noticeErrorByDingtalk(Exception e) {
+//        // 通知人为空为空则忽略
+//        if (ObjectUtil.isNull(mcConf.getEngineers()) || mcConf.getEngineers().isEmpty()) {
+//            return;
+//        }
+//        String content = e.getMessage();
+//        if (e instanceof McException) {
+//            McException mcE = (McException) e;
+//            content = mcE.toString();
+//        }
+//        log.warn("上报错误日志, {}, {}", mcConf.getEngineers(), content);
+//        content += " --> " + UtilDateTime.formatDateTime(new Date());
+//        JSONObject message = new JSONObject();
+//        message.put("msgtype", "text");
+//        JSONObject info = new JSONObject();
+//        info.put("content", content);
+//        message.put("text", info);
+//        ddClient.sendCorpConversationMessage(ddConf.getAgentId(), mcConf.getEngineers(), null, false, message);
+//    }
+//}

+ 32 - 0
mjava/src/main/java/com/malk/filter/RequestFilter.java

@@ -0,0 +1,32 @@
+package com.malk.filter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import java.io.IOException;
+
+@Component
+public class RequestFilter implements Filter {
+
+    // 指定类输出日志到指定文件夹
+    private static final Logger logger = LoggerFactory.getLogger("point");
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        logger.info("过滤器 ▷ 初始化");
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        logger.trace("过滤器 ▷ 开始执行");
+        chain.doFilter(request, response);
+        logger.trace("过滤器 ▷ 执行结束");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info("过滤器 ▷ 销毁");
+    }
+}

+ 41 - 0
mjava/src/main/java/com/malk/filter/RequestInterceptor.java

@@ -0,0 +1,41 @@
+package com.malk.filter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 请求拦截器: 继承 HandlerInterceptor 或实现 HandlerInterceptor
+ */
+@Component
+public class RequestInterceptor extends HandlerInterceptorAdapter {
+
+    // 指定类输出日志到指定文件夹
+    private static final Logger logger = LoggerFactory.getLogger("point");
+
+    // 请求拦截
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        logger.info("拦截器 ▷ 收到请求: {}", request.getServletPath());
+        return super.preHandle(request, response, handler);
+    }
+
+    // 视图渲染
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        logger.trace("拦截器 ▷ 视图渲染");
+        super.postHandle(request, response, handler, modelAndView);
+    }
+
+    // 数据返回
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        logger.trace("拦截器 ▷ 数据返回");
+        super.afterCompletion(request, response, handler, ex);
+    }
+}

+ 13 - 0
mjava/src/main/java/com/malk/repository/dao/primary/McAuthorizationDao.java

@@ -0,0 +1,13 @@
+package com.malk.repository.dao.primary;
+
+import com.malk.repository.entity.primary.McAuthorizationPo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * JAP配置参考BaseDao
+ */
+public interface McAuthorizationDao extends JpaRepository<McAuthorizationPo, Long> {
+
+    // findBy, 可直接添加字段名称
+    McAuthorizationPo findByAppType(String appType);
+}

+ 10 - 0
mjava/src/main/java/com/malk/repository/dao/primary/McTableDao.java

@@ -0,0 +1,10 @@
+package com.malk.repository.dao.primary;
+
+import com.malk.repository.entity.primary.McTablePo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository("primaryMcTableDao")
+public interface McTableDao extends JpaRepository<McTablePo, Long> {
+
+}

+ 11 - 0
mjava/src/main/java/com/malk/repository/dao/slave/McTableDao.java

@@ -0,0 +1,11 @@
+package com.malk.repository.dao.slave;
+
+
+import com.malk.repository.entity.slave.McTablePo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository("slaveMcTableDao")
+public interface McTableDao extends JpaRepository<McTablePo, Long> {
+
+}

+ 51 - 0
mjava/src/main/java/com/malk/repository/entity/primary/McAuthorizationPo.java

@@ -0,0 +1,51 @@
+package com.malk.repository.entity.primary;
+
+import com.malk.base.BasePo;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 宜搭授权信息类
+ **/
+@Entity
+@Data
+@NoArgsConstructor
+@Table(name = "mc_authorization")
+public class McAuthorizationPo extends BasePo {
+
+    @Range(min = 0, max = 1)
+    private int delStatus = 0; // 是否删除: 设置默认值
+
+    @NotNull(message = "应用编码不能为空")
+    private String appType;
+
+    @NotNull(message = "应用秘钥不能为空")
+    private String systemToken;
+
+    @NotNull(message = "应用名称不能为空")
+    private String appName;
+
+    @NotNull(message = "授权企业编号不能为空")
+    private String corpId;
+
+    private String corpName;
+
+    @NotNull(message = "申请人用户编号不能为空")
+    private String userId;
+
+    @NotNull(message = "申请人姓名不能为空")
+    private String userName;
+
+    private String deptId;
+
+    private String deptName;
+
+    private String description;
+
+    private String remark;
+}

+ 34 - 0
mjava/src/main/java/com/malk/repository/entity/primary/McTablePo.java

@@ -0,0 +1,34 @@
+package com.malk.repository.entity.primary;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.malk.base.BasePo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.Table;
+
+/**
+ * 主表记录
+ */
+@Entity
+@Table(name = "mc_table")
+@EntityListeners(AuditingEntityListener.class)
+@JsonInclude(value = JsonInclude.Include.NON_NULL)
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class McTablePo extends BasePo {
+
+    @Column
+    private String tName;
+
+    @Column
+    private String tDesc;
+}

+ 34 - 0
mjava/src/main/java/com/malk/repository/entity/slave/McTablePo.java

@@ -0,0 +1,34 @@
+package com.malk.repository.entity.slave;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.malk.base.BasePo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.Table;
+
+/**
+ * 从表记录
+ */
+@Entity
+@Table(name = "mc_table")
+@EntityListeners(AuditingEntityListener.class)
+@JsonInclude(value = JsonInclude.Include.NON_NULL)
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class McTablePo extends BasePo {
+
+    @Column
+    private String tName;
+
+    @Column
+    private String tDesc;
+}

+ 58 - 0
mjava/src/main/java/com/malk/schedule/McScheduleTask.java

@@ -0,0 +1,58 @@
+package com.malk.schedule;
+
+import com.malk.service.dingtalk.DDClient;
+import com.malk.service.dingtalk.DDClient_Event;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+
+/**
+ * 定时任务ScheduleTask
+ * -
+ * 1. @EnableScheduling:开启定时任务,当前文件文件全局注解【也可单独成为一个控制的配置文件管控全局】
+ * 2. @Scheduled:定时执行的方法,通过入参控制
+ * - 1. @Scheduled(fixedDelay = 5000):单位毫秒,当任务执行完毕后5s后再执行
+ * - 2. @Scheduled(fixedRate = 3000):单位毫秒,表示每隔3秒,不受执行时间影响
+ * - 3. cron表达式:cron一共有7位,但是最后一位是年,可以留空,cron中,还有一些特殊的符号
+ * 3. @component / @Configuration:声明定时任务为组件类。若不声明,定时器无效,因为没有注入
+ */
+
+/**
+ * @EnableScheduling 条件注入, 根据条件确定当前类是否要装载Bean: 如定时器开发环境不启动
+ * -
+ * 示例:注意格式 @ConditionalOnExpression(value = "${spel.scheduling}") 或者 @ConditionalOnProperty(name = "spel.scheduling", havingValue = "false")
+ * *
+ * @ConditionalOnExpression,可多个参数,支持与、或关系,默认匹配bool。注意若对应环境未识别到声明会报错
+ * @ConditionalOnProperty,可多个参数,支持与,若获取值为空识别为false,若有值则将该值与havingValue指定的值进行比较,匹配结果为bool。不支持或
+ */
+
+@Slf4j
+@Configuration
+@EnableScheduling
+@ConditionalOnProperty(name = {"spel.scheduling"}, havingValue = "false")
+public class McScheduleTask {
+
+    @Autowired
+    private DDClient ddClient;
+
+    @Autowired
+    private DDClient_Event ddClient_event;
+
+    /**
+     * 钉钉事件回调 3_3
+     * -
+     * 同步钉钉推送失败记录: 推送失败列表, 获取后记录会被清空
+     */
+//    @Scheduled(cron = "0 0/30 7-23 * * ?")
+    public void syncDingTalkFailedList() {
+        try {
+            ddClient_event.syncFailedList(ddClient.getAccessToken());
+        } catch (Exception e) {
+            // 记录错误信息
+            e.printStackTrace();
+        }
+    }
+}

+ 187 - 0
mjava/src/main/java/com/malk/server/aliwork/YDConf.java

@@ -0,0 +1,187 @@
+package com.malk.server.aliwork;
+
+import com.alibaba.fastjson.JSON;
+import com.malk.utils.UtilMap;
+import com.malk.utils.UtilString;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "aliwork")
+@Slf4j
+public class YDConf {
+
+    private String appType;
+
+    private String systemToken;
+
+    /**
+     * 一个切片数量上限
+     */
+    public static final Integer UPPER_LIMIT = 30000;
+
+    /**
+     * 一个分页数量上限
+     */
+    public static final Integer PAGE_SIZE_LIMIT = 100;
+
+    /**
+     * 接口访问账号 [不能触发待办与消息通知, 业务规则亦不能]
+     * -
+     * 非管理员账号只可以查询, 不检验权限
+     * 操作数据需要管理员账号, 或宜搭平台
+     */
+    public static final String PUB_ACCOUNT = "yida_pub_account";
+
+    ////////////////////////// 新版本API //////////////////////////
+
+    /**
+     * 查询表单
+     */
+    public enum FORM_QUERY {
+
+        retrieve_list,              // 全局查询, 不包含子表单
+        retrieve_list_all,          // 全局查询, 包含子表单
+        multi_retrieve_id,
+
+        retrieve_id,                // 单个ID查询 todo 若秘钥不匹配, 返回空, 添加报错说明
+
+        retrieve_search_process,            // 流程列表
+        retrieve_search_form,               // 表单列表
+
+        retrieve_search_process_id,         // 流程列表
+        retrieve_search_form_id,             // 表单列表
+
+        retrieve_details,             // 子表数据[表单]
+        retrieve_changed,    // 变更记录
+        retrieve_definition, // 表单定义
+
+    }
+
+    /**
+     * 表单操作
+     */
+    public enum FORM_OPERATION {
+        create,
+        delete,             // 传入为body, 文档为param
+        update,
+        multi_create,               // 批量操作
+        delete_batch,               // 批量删除
+        multi_update,               // 批量更新
+        start,                      // 发起流程
+        batchSave,                  // 批量创建
+    }
+
+    /**
+     * 关联表单处理
+     *
+     * @param formType: "receipt" 跳转为表单【若是流程,则权限体系会失效,但也会显示审批节点】; formType: "process" 为流程
+     * @apiNote ppExt 接口更新, 传入jsonString或List都可以. 返回数据都是两层json解析, 组件 + _id格式
+     */
+    public List<Map> associationForm(String formUuid, String formInstanceId, String title, String subTitle, boolean isProcess) {
+        return associationForm(appType, formUuid, formInstanceId, title, subTitle, isProcess);
+    }
+
+    // todo 部门ID写入需要是string集合\数组, 封装
+    public static List<Map> associationForm(String appType, String formUuid, String formInstanceId, String title, String subTitle, boolean isProcess) {
+        String formType = isProcess ? "process" : "receipt";
+        return Arrays.asList(UtilMap.map("appType, formUuid, instanceId, title, subTitle, formType", appType, formUuid, formInstanceId, title, subTitle, formType));
+    }
+
+    /**
+     * 读取关联表单: ppExt 两层解析后才是List, 若是赋值取值转一层, 宜搭也可进行写入
+     * - 赋值说明 -
+     * 若是同一个应用,appType与formUuid为空(不指定下formUuid可为错误,但appType只能为空),点击页面链接会自动匹配;
+     * 若是跨应用实例,则不能通过导入,需要通过接口指定appType
+     */
+    public List<Map> associationForm(String associations) {
+        if (UtilString.isBlankCompatNull(associations)) {
+            return new ArrayList<>();
+        }
+        return (List<Map>) JSON.parse(String.valueOf(JSON.parse(String.valueOf(associations))));
+    }
+
+    /**
+     * 高级筛选: ppExt 通过表单\流程 search 宜搭目前下拉框也会被模糊匹配, 为避免事后过滤, 使用高级查询; 且高级查询支持同一个字段多条件
+     */
+    public static Map searchCondition_TextFiled(String compId, Object value, String operator) {
+        return UtilMap.map("key, value, type, operator, componentName", compId, value, "TEXT", operator, "TextField");
+    }
+
+    // todo text组件是否可用于select
+    public static Map searchCondition_processInstanceStatus(List status) {
+        return UtilMap.map("key, value, type, operator, componentName", "processInstanceStatus", status, "ARRAY", "in", "SelectField");
+    }
+
+    /**
+     * 组件格式化取值 [取值] todo 明细表递归, 循环传递入参
+     */
+    public static Object getDataByCompId(Map formData, String compId_cur) {
+        if (compId_cur.contains("associationFormField_")) {
+            // 服务注册 #{_yida_all_data} 直接组件Id
+            if (!formData.containsKey(compId_cur)) {
+                // 接口返回数据, 关联组件ID, 不会返回组件id字段
+                compId_cur = compId_cur + "_id";
+            }
+            return JSON.parse(String.valueOf(formData.get(compId_cur)));
+        } else if (compId_cur.contains("employeeField_")) {
+            if (!formData.containsKey(compId_cur + "_id")) {
+                // 服务注册 #{_yida_all_data} 返回JsonString userid 数组
+                return JSON.parse(String.valueOf(formData.get(compId_cur)));
+            } else {
+                // 成员组件, 接口返回组件id返回为姓名, _id返回是userId
+                return formData.get(compId_cur + "_id");
+            }
+        }
+        return formData.get(compId_cur);
+    }
+
+    ////////////////////////// 老版本API //////////////////////////
+
+    /**
+     * 表单接口适用于流程: 查询和更新以及删除
+     */
+    private static String formatApiForm(String uri) {
+        return "/yida_vpc/form/" + uri + ".json";
+    }
+
+    private static String formatApiProcess(String uri) {
+        return "/yida_vpc/process/" + uri + ".json";
+    }
+
+    /**
+     * 接口地址: 表单
+     */
+    public static final String API_FORM_CREATE = formatApiForm("saveFormData");
+    public static final String API_FORM_DELETE = formatApiForm("deleteFormData");
+    public static final String API_FORM_UPDATE = formatApiForm("updateFormData");
+    public static final String API_FORM_DETAIL = formatApiForm("getFormDataById");
+    public static final String API_FORM_QUERY_ID = formatApiForm("searchFormDataIds");
+    public static final String API_FORM_QUERY_DATA = formatApiForm("searchFormDatas");
+
+    public static final String API_FORM_DEFINITION = "/yida_vpc/formDesign/getFormComponentDefinationList.json";
+
+    /**
+     * 接口地址: 流程
+     */
+    public static final String API_PROCESS_CREATE = formatApiProcess("startInstance");
+    public static final String API_PROCESS_DELETE = formatApiProcess("deleteInstance");
+    public static final String API_PROCESS_UPDATE = formatApiProcess("updateInstance");
+    public static final String API_PROCESS_DETAIL = formatApiProcess("getInstanceById");
+    public static final String API_PROCESS_BATCH_DETAIL = formatApiProcess("getInstancesByIds");
+    public static final String API_PROCESS_QUERY_ID = formatApiProcess("getInstanceIds");
+    public static final String API_PROCESS_QUERY_DATA = formatApiProcess("getInstances");
+
+    /**
+     * 其它接口
+     */
+    public static final String API_OPEN_URL = "/yida_vpc/file/getOpenUrl.json";
+}

+ 225 - 0
mjava/src/main/java/com/malk/server/aliwork/YDParam.java

@@ -0,0 +1,225 @@
+package com.malk.server.aliwork;
+
+import com.alibaba.fastjson.JSONObject;
+import com.malk.base.BaseDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import javax.validation.groups.Default;
+import java.util.List;
+
+/**
+ * 表单接口适用于流程: 查询和更新以及删除 [参数校验参考CatchException]
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class YDParam extends BaseDto {
+
+    /**
+     * 接口参数
+     */
+    @NotNull(message = "应用编码不能为空")
+    private String appType;
+
+    @Null(message = "应用秘钥无需传递")
+    private String systemToken;
+
+    // 默认宜搭平台, 有操作数据权限
+    @Builder.Default
+    private String userId = YDConf.PUB_ACCOUNT;
+
+    @NotNull(message = "表单编码不能为空", groups = {Create.class, Retrieve_Condition.class, Definition.class, Create_Process.class, Retrieve_Condition_Update.class})
+    private String formUuid;
+
+    /// FIXME: 表单/流程组件查询
+    private String searchFieldJson;
+
+    @Builder.Default
+    private Integer currentPage = 1;
+
+    @Builder.Default
+    private Integer pageSize = YDConf.PAGE_SIZE_LIMIT;
+
+    // 流程暂不支持排序
+    private String dynamicOrder;
+
+    // 修改开始时间, ppExt: 需要同时传递开始和就结束才会生效; 其次日期格式yyyy-MM-dd, 但默认是0点, 结束日期j建议加1
+    private String modifiedFromTimeGMT;
+
+    // 修改结束时间, ppExt: 需要同时传递开始和就结束才会生效; 其次日期格式yyyy-MM-dd, 但默认是0点, 结束日期j建议加1
+    private String modifiedToTimeGMT;
+
+    @NotNull(message = "实例ID不能为空", groups = {Update.class, Delete.class, Retrieve_FormInstId.class})
+    private String formInstId;
+
+    @NotNull(message = "更新内容不能为空", groups = {Update.class, Update_ProcessInstanceId.class, Retrieve_Condition_Update.class})
+    private String updateFormDataJson;
+
+    @NotNull(message = "流程编码不能为空", groups = Create_Process.class)
+    private String processCode;
+
+    // todo: 成员组件未匹配, 接口可以新增 [系统会忽略], 导入会提示无法匹配
+    @NotNull(message = "新增内容不能为空", groups = {Create.class, Create_Process.class})
+    public String formDataJson;
+
+    @NotNull(message = "实例ID不能为空", groups = {Update_ProcessInstanceId.class, Delete_ProcessInstanceId.class, Retrieve_ProcessInstanceId.class})
+    private String processInstanceId;
+
+    @NotNull(message = "实例ID不能为空", groups = Retrieve_ProcessInstanceIds.class)
+    private String processInstanceIds;
+
+    private String instanceStatus;
+
+    private String approvedResult;
+
+    /**
+     * 格式化赋值: 内部使用
+     */
+    public void setDynamicOrder(String dynamicOrder) {
+        this.dynamicOrder = dynamicOrder;
+    }
+
+    public void setDynamicOrder(String rule, String... compIds) {
+        for (String compId : compIds) {
+            JSONObject orderJson = new JSONObject();
+            orderJson.put(compId, rule);
+            this.dynamicOrder = orderJson.toJSONString();
+        }
+    }
+
+    /**
+     * 自定义参数
+     */
+    private String compIdSerial; // 流水号排序字段
+
+    /**
+     * 钉钉新版本接口
+     */
+    @Builder.Default
+    private Integer pageNumber = 1;
+
+    private String formInstanceId;
+
+    // formInstanceId 为新版本实例id字段
+    public String getFormInstanceId() {
+        if (StringUtils.isBlank(formInstanceId)) {
+            return formInstId;
+        }
+        return formInstanceId;
+    }
+
+    /// FIXME: 表单/流程全局查询
+    private String searchCondition;
+
+    // 全局条件查询列表数据 FIXME: 若是查询组件也传searchFieldJson格式
+    public String getSearchCondition() {
+        if (StringUtils.isBlank(searchCondition)) {
+            return searchFieldJson;
+        }
+        return searchCondition;
+    }
+
+    // 查询列表可查询多个指定实例ID | 批量删除 [上限50] | 批量更新
+    private List<String> formInstanceIdList;
+
+    // 是否需要宜搭表单组件格式的实例数据
+    private boolean needFormInstanceValue = false;
+
+    // 查询明细数据列表, 默认仅返回前50
+    private String tableFieldId;
+
+    // 附件转临时免登地址
+    private String fileUrl;
+    // 临时地址失效时间, 默认10分钟, 最大值24小时
+    @Builder.Default
+    private Integer timeout = 600000;
+
+    /**
+     * 批量删除
+     */
+
+    // 是否需要宜搭服务端异步执行该任务
+    @Builder.Default
+    boolean asynchronousExecution = false;
+
+    // 是否需要触发表单绑定的校验规则、关联业务规则和第三方服务回调
+    @Builder.Default
+    boolean executeExpression = false;
+
+    // 是否不触发表单绑定的校验规则、关联业务规则和第三方服务回调。
+    @Builder.Default
+    boolean noExecuteExpression = true;
+
+    // 是否忽略空值。
+    @Builder.Default
+    boolean ignoreEmpty = true;
+
+    // 是否使用最新的表单schema版本。
+    @Builder.Default
+    boolean useLatestFormSchemaVersion = true;
+
+    // 使用最新的表单版本进行更新。
+    @Builder.Default
+    boolean useLatestVersion = false;
+
+    /**
+     * 分组校验
+     *
+     * @RequestBody @Validated(YDParam.Create.class) YDParam ydParam
+     */
+
+    public interface Create extends Default {
+
+    }
+
+    public interface Create_Process extends Default {
+
+    }
+
+    public interface Retrieve_Condition extends Default {
+
+    }
+
+    public interface Retrieve_Condition_Update extends Default {
+
+    }
+
+    public interface Retrieve_FormInstId extends Default {
+
+    }
+
+    public interface Retrieve_ProcessInstanceId extends Default {
+
+    }
+
+    public interface Retrieve_ProcessInstanceIds extends Default {
+
+    }
+
+    public interface Update extends Default {
+
+    }
+
+    public interface Update_ProcessInstanceId extends Default {
+
+    }
+
+    public interface Delete extends Default {
+
+    }
+
+    public interface Delete_ProcessInstanceId extends Default {
+
+    }
+
+    public interface Definition extends Default {
+
+    }
+}

+ 32 - 0
mjava/src/main/java/com/malk/server/aliwork/YDR.java

@@ -0,0 +1,32 @@
+package com.malk.server.aliwork;
+
+import com.malk.utils.UtilMap;
+import lombok.Data;
+import org.springframework.data.domain.Page;
+
+import java.util.Map;
+
+/**
+ * * 返回数据_宜搭
+ **/
+@Data
+public class YDR {
+
+    private boolean success;
+
+    private String errorCode;
+
+    private String errorMsg;
+
+    // 查询为data之集合, 新增为实例Id, 删除/更新为空, ....
+    private Object result;
+
+    /**
+     * 宜搭表格分页管理
+     */
+    public static final Map formatPage(Page<Map> page) {
+        Map data = UtilMap.map("currentPage, pageSize, totalCount", page.getNumber() + 1, page.getNumberOfElements(), page.getTotalElements());
+        data.put("data", page.getContent());
+        return data;
+    }
+}

+ 33 - 0
mjava/src/main/java/com/malk/server/aliyun/ALYR.java

@@ -0,0 +1,33 @@
+package com.malk.server.aliyun;
+
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+
+/**
+ * 返回数据_阿里云
+ */
+@Data
+public class ALYR<T> extends VenR {
+
+    private boolean success;
+
+    private String code;
+
+    private String message;
+
+    private String description;
+
+    private T data;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "0";
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(!code.equals(SUC_CODE), code, message + " >>> " + description, "aliyun");
+    }
+}

+ 42 - 0
mjava/src/main/java/com/malk/server/common/FilePath.java

@@ -0,0 +1,42 @@
+package com.malk.server.common;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取配置文件参考McConf
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "file")
+public class FilePath {
+
+    @Autowired
+    private Path path;
+
+    @Autowired
+    private Source source;
+
+    @Data
+    @Configuration
+    @ConfigurationProperties(prefix = "file.path")
+    public class Path {
+
+        private String file;
+
+        private String image;
+
+        private String tmp;
+    }
+
+    @Data
+    @Configuration
+    @ConfigurationProperties(prefix = "file.source")
+    public class Source {
+
+        private String fonts;
+    }
+}

+ 87 - 0
mjava/src/main/java/com/malk/server/common/McConf.java

@@ -0,0 +1,87 @@
+package com.malk.server.common;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * 读取配置文件
+ *
+ * @Value("${ }") :变量读取方式,尤其注意不支持读取yml文件内容,可通过在变量后 :10 设置默认值为 10
+ * 添加的属性前,为该字段赋值:@Value("${dingding.appKey}"
+ * 需要3个前提: 不能使用static或final修饰了tagValue; 类没有加上@Component(或者@service等); 类被new新建了实例,而没有使用@Autowire
+ * * --------------------------------------------------------------------------------- *
+ * @ConfigurationProperties(prefix = "pre") 对象读取方式: 实例化承载对象
+ * 将指定前缀配置实例化为实体类 [添加 spring-boot-configuration-processor依赖避免idea报错]
+ * 尤其注意: 需要为类添加组件注解, 如 @Service, @Component, ...; 引用实体类必须通过 @Autowired 进行注入, 否则识别到为空 [使用注意与 @Value 相同]
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "corp")
+public class McConf {
+
+    private int timeOut;
+
+    private int timeAwait;
+
+    private List<String> engineers;
+
+    /**
+     * 最大分页
+     */
+    public static int pageSize = 100;
+
+    /**
+     * 分页数据
+     */
+    public static PageRequest simplePage(@Nullable Map param) {
+        int page = Integer.parseInt(String.valueOf(Optional.ofNullable(param.get("page")).orElse("1")));
+        int size = Integer.parseInt(String.valueOf(Optional.ofNullable(param.get("size")).orElse(pageSize)));
+        page -= 1;
+        if (page < 0) {
+            page = 0;
+        }
+        if (size > pageSize) {
+            size = pageSize;
+        }
+        if (size < 1) {
+            size = 1;
+        }
+        return PageRequest.of(page, size);
+    }
+
+    /**
+     * 全部数据
+     */
+    public static PageRequest allDataPage() {
+        return PageRequest.of(0, Integer.MAX_VALUE);
+    }
+
+    /**
+     * 单条数据
+     */
+    public static PageRequest singleDataPage() {
+        return PageRequest.of(0, 1);
+    }
+
+    /**
+     * 简单分页: 先查询再分页, 用于数据组装场景
+     */
+    public static List manualPage(PageRequest pageRequest, List dataList) {
+        long total = dataList.size();
+        if (pageRequest.getPageSize() < total) {
+            int start = pageRequest.getPageNumber() * pageRequest.getPageSize();
+            if (start > total) start = (int) total;
+            int end = (pageRequest.getPageNumber() + 1) * pageRequest.getPageSize();
+            if (end > total) end = (int) total;
+            dataList = dataList.subList(start, end);
+        }
+        return dataList;
+    }
+}

+ 167 - 0
mjava/src/main/java/com/malk/server/common/McException.java

@@ -0,0 +1,167 @@
+package com.malk.server.common;
+
+import com.malk.utils.UtilServlet;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
+
+/**
+ * 通用错误类 [错误抛出与拦截详见 CatchException]
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class McException extends RuntimeException {
+
+    private static final long serialVersionUID = 5131110381034275224L;
+
+    private boolean success;
+
+    private String code;
+
+    private String message;
+
+    // 错误来源
+    private String source;
+
+    public McException(McREnum rEnum) {
+        this(rEnum.isSuc(), rEnum.getCode(), rEnum.getMsg());
+    }
+
+    public McException(String code, String message) {
+        this(false, code, message);
+    }
+
+    public McException(boolean suc, String code, String message) {
+        super(message);
+        this.success = suc;
+        this.code = code;
+        this.message = message;
+    }
+
+
+    /// 断言错误: 自定义错误信息 ///
+
+    /**
+     * 错误断言: 枚举
+     */
+    public static void assertException(boolean isAssert, McREnum rEnum) {
+        if (isAssert) {
+            throw McException.builder().code(rEnum.getCode()).message(rEnum.getMsg()).build();
+        }
+    }
+
+    /**
+     * 错误断言: 信息
+     */
+    public static void assertException(boolean isAssert, String code, String message) {
+        if (isAssert) {
+            throw McException.builder().code(code).message(message).build();
+        }
+    }
+
+    /**
+     * 错误断言: 来源
+     */
+    public static void assertException(boolean isAssert, String code, String message, String source) {
+        if (isAssert) {
+            throw McException.builder().code(code).message(message).source(source).build();
+        }
+    }
+
+    /**
+     * 断言: 业务校验不通过
+     */
+    public static void
+    assertAccessException(boolean isAssert, String message) {
+        if (isAssert) {
+            throw McException.builder().code(McREnum.VALIDATED_ACCESS.getCode()).message(message).build();
+        }
+    }
+
+    /**
+     * 断言: 参数校验不通过
+     */
+    public static void assertParamException(boolean isAssert, String message) {
+        if (isAssert) {
+            throw McException.builder().code(McREnum.VALIDATED_PARAM.getCode()).message(message).build();
+        }
+    }
+
+    /**
+     * 断言: 参数不合法
+     * -
+     * 实例: McException.assertParamException_Null(UtilServlet.isNull(param, "projectName", "userName"));
+     */
+    public static void assertParamException_Null(String key) {
+        if (StringUtils.isNotBlank(key)) {
+            throw McException.builder().code(McREnum.VALIDATED_PARAM.getCode()).message(("参数不能为空: ").concat(key)).build();
+        }
+    }
+
+    public static void assertParamException_Null(Map param, String... keys) {
+        McException.assertParamException_Null(UtilServlet.isNull(param, keys));
+    }
+
+    public static void assertParamException_Null(Map param, String keys) {
+        McException.assertParamException_Null(UtilServlet.isNull(param, keys));
+    }
+
+    /**
+     * 断言: 参数不能为空
+     */
+    public static void assertParamException_Rule(String key) {
+        if (StringUtils.isNotBlank(key)) {
+            throw McException.builder().code(McREnum.VALIDATED_PARAM.getCode()).message(("参数不合法: ").concat(key)).build();
+        }
+    }
+
+    /// 快速枚举: 自定义错误信息 ///
+
+    /**
+     * 参数不合法
+     */
+    public static McR exceptionParam(String message) {
+        throw McException.builder().code(McREnum.VALIDATED_PARAM.getCode()).message(message).build();
+    }
+
+    /**
+     * 无效token
+     */
+    public static McR exceptionToken(String message) {
+        throw McException.builder().code(McREnum.TOKEN_INVALID.getCode()).message(message).build();
+    }
+
+    /**
+     * 授权无效
+     */
+    public static McR exceptionAuth(String message) {
+        throw McException.builder().code(McREnum.NOT_AUTHORIZED.getCode()).message(message).build();
+    }
+
+    /**
+     * 业务校验不通过
+     */
+    public static McR exceptionAccess(String message) {
+        throw McException.builder().code(McREnum.VALIDATED_ACCESS.getCode()).message(message).build();
+    }
+
+    /**
+     * 方法执行失败
+     */
+    public static McR exceptionExecute(String message) {
+        throw McException.builder().code(McREnum.METHOD_EXECUTE.getCode()).message(message).build();
+    }
+
+    /**
+     * 未知错误
+     */
+    public static McR exceptionUnknown(String message) {
+        throw McException.builder().code(McREnum.UNKNOWN_EXCEPTION.getCode()).message(message).build();
+    }
+}

+ 40 - 0
mjava/src/main/java/com/malk/server/common/McPage.java

@@ -0,0 +1,40 @@
+package com.malk.server.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+/**
+ * 分页集合数据结构
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class McPage {
+
+    private int page = 1;
+
+    private int size;
+
+    private long total = 0;
+
+    private List list;
+
+    public static McPage page(Page page) {
+        return page(page, page.getContent());
+    }
+
+    public static McPage page(Page page, List dataList) {
+        return McPage.builder()
+                .total(page.getTotalElements())
+                .page(page.getNumber())
+                .size(page.getSize())
+                .list(dataList)
+                .build();
+    }
+}

+ 105 - 0
mjava/src/main/java/com/malk/server/common/McR.java

@@ -0,0 +1,105 @@
+package com.malk.server.common;
+
+import com.malk.base.BaseDto;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 定义返回值结构信息
+ * - java使用了未经检查或不安全的操作,编译会有打印,如泛型 T
+ * 单个文件屏蔽: @SuppressWarnings("unchecked") 。注解在类上编辑就不会有输出
+ * 插件显示警告: 配置 -Xlint:unchecked, 显示具体报错警告位置, 如 Map, List 也会报警告
+ */
+@Data
+@Builder
+public class McR<T> extends BaseDto {
+
+    private boolean success;
+    private String code;
+    private String message;
+    private T data;
+
+    // 错误来源
+    private String source;
+
+    /// 错误实例 ///
+
+    public McR(McREnum rEnum, T data) {
+        this(rEnum.isSuc(), rEnum.getCode(), rEnum.getMsg(), data);
+    }
+
+    public McR(boolean success, String code, String message, T data, String source) {
+        this.success = success;
+        this.code = code;
+        this.message = message;
+        this.data = data;
+        this.source = source;
+    }
+
+    public McR(boolean success, String code, String message, T data) {
+        this(success, code, message, data, null);
+    }
+
+    /// 静态访问 ///
+
+    public static McR R(McREnum rEnum) {
+        return new McR(rEnum, null);
+    }
+
+    public static McR R(McREnum rEnum, Object data) {
+        return new McR(rEnum, data);
+    }
+
+    public static McR R(boolean success, String code, String message, Object data, String source) {
+        return new McR(success, code, message, data, source);
+    }
+
+    /// 快速访问: 实例 ///
+
+    public static McR error(String code, String message) {
+        return R(false, code, message, null, null);
+    }
+
+    public static McR errorParam(String message) {
+        return error(McREnum.VALIDATED_PARAM.getCode(), message);
+    }
+
+    public static McR errorAccess(String message) {
+        return error(McREnum.VALIDATED_ACCESS.getCode(), message);
+    }
+
+    public static McR errorAuth(String message) {
+        return error(McREnum.NOT_AUTHORIZED.getCode(), message);
+    }
+
+    public static McR errorVendor(String message, String source) {
+        return R(false, McREnum.VENDOR_ERROR.getCode(), message, null, source);
+    }
+
+    public static McR errorUnknown(String message) {
+        return error(McREnum.UNKNOWN_EXCEPTION.getCode(), message);
+    }
+
+    /// 快速访问: 枚举 ///
+
+    public static McR success() {
+        return R(McREnum.SUCCESS);
+    }
+
+    public static McR success(Object data) {
+        return R(McREnum.SUCCESS, data);
+    }
+
+    public static McR errorIgnore() {
+        return R(McREnum.IGNORE_EXECUTE);
+    }
+
+    public static McR errorToken() {
+        return R(McREnum.TOKEN_INVALID);
+    }
+
+    public static McR errorNullPointer() {
+        return R(McREnum.NULL_POINTER);
+    }
+}
+

+ 33 - 0
mjava/src/main/java/com/malk/server/common/McREnum.java

@@ -0,0 +1,33 @@
+package com.malk.server.common;
+
+import lombok.Getter;
+
+/**
+ * 定义返回值和对应状态的信息
+ */
+public enum McREnum {
+
+    SUCCESS(true, "200", "SUCCESS"),
+    IGNORE_EXECUTE(true, "200", "IGNORE THE CURRENT EXECUTE RESULT"),
+    VALIDATED_PARAM(false, "4001", "PARAMETER VERIFICATION FAILS"),
+    TOKEN_INVALID(false, "4002", "TOKEN INVALID"),
+    NOT_AUTHORIZED(false, "4003", "ERROR INVALID AUTH STATE"),
+    VALIDATED_ACCESS(false, "4004", "VALIDATE IS DISSATISFY THE CONDITION"),
+    METHOD_EXECUTE(false, "5001", "ENCOUNTER AN ERROR WHEN EXECUTE METHOD"),
+    NULL_POINTER(false, "5002", "ENCOUNTER AN ERROR NULL POINTER EXCEPTION"),
+    VENDOR_ERROR(false, "5004", "VENDOR PLATFORM ERROR EXCEPTION"),
+    UNKNOWN_EXCEPTION(false, "6001", "THIS IS AN UNKNOWN EXCEPTION");
+
+    @Getter
+    private String code;
+    @Getter
+    boolean suc;
+    @Getter
+    private String msg;
+
+    McREnum(boolean suc, String code, String msg) {
+        this.suc = suc;
+        this.code = code;
+        this.msg = msg;
+    }
+}

+ 55 - 0
mjava/src/main/java/com/malk/server/common/VenR.java

@@ -0,0 +1,55 @@
+package com.malk.server.common;
+
+import com.malk.base.BaseDto;
+import com.malk.utils.UtilHttp;
+import lombok.Data;
+import lombok.SneakyThrows;
+
+import java.util.Map;
+
+/**
+ * 定义第三方返回值结构信息
+ */
+@Data
+public class VenR extends BaseDto {
+
+    /**
+     * 断言错误信息: 子类实现 [静态代理]
+     */
+    public void assertSuccess() {
+
+    }
+
+    ///-- 反射 [通过Class.forName(全类名)方式获取Class]
+
+    public static final String RC_MC = "com.malk.server.common.MCR";
+    public static final String RC_YD = "com.malk.server.aliwork.YDR";
+    public static final String RC_ALY = "com.malk.server.aliyun.ALYR";
+    public static final String RC_DD = "com.malk.server.dingtalk.DDR";
+    public static final String RC_DD_New = "com.malk.server.dingtalk.DDR_New";
+    public static final String RC_EKB = "com.malk.server.ekuaibao.EKBRR";
+    public static final String RC_FXK = "com.malk.server.fxiaoke.FXKR ";
+    public static final String RC_XBB = "com.malk.server.xbongbong.XBBR";
+    public static final String RC_VK = "com.malk.server.vika.VKR";
+
+    /**
+     * 通用post请求
+     */
+    @SneakyThrows
+    public static VenR doPost(String url, Map header, Map param, Map body, String path) {
+        Class rClass = Class.forName(path);
+        VenR rsp = UtilHttp.doPost(url, header, param, body, rClass);
+        return rsp;
+    }
+
+    /**
+     * 通用get请求
+     */
+    @SneakyThrows
+    public static VenR doGet(String url, Map header, Map param, String path) {
+        Class rClass = Class.forName(path);
+        VenR rsp = UtilHttp.doGet(url, header, param, rClass);
+        return rsp;
+    }
+}
+

+ 76 - 0
mjava/src/main/java/com/malk/server/dingtalk/DDConf.java

@@ -0,0 +1,76 @@
+package com.malk.server.dingtalk;
+
+import com.malk.utils.UtilMap;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 读取配置文件参考FilePah
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "dingtalk")
+public class DDConf {
+
+    private Number agentId;
+
+    private String appKey;
+
+    private String appSecret;
+
+    private String corpId;
+
+    private String corpToken;
+
+    private String aesKey;
+
+    private String token;
+
+    // 操作人, 需要为OA后台管理员
+    private String operator;
+
+    // 机器人编号
+    private String robotCode;
+
+    /**
+     * 钉钉一级部门: 1
+     */
+    public static final long TOP_DEPARTMENT = 1L;
+
+    /**
+     * 钉钉回调响应
+     */
+    public static final String CALLBACK_RESPONSE = "success";
+
+    /**
+     * 验证注册地址, 通过开发平台配置触发
+     */
+    public static final String CALLBACK_CHECK = "check_url";
+
+    /**
+     * 审批任务回调 [审批任务开始、结束、转交]
+     */
+    public static final String BPMS_TASK_CHANGE = "bpms_task_change";
+
+    /**
+     * 审批实例回调 [审批实例开始、结束]
+     */
+    public static final String BPMS_INSTANCE_CHANGE = "bpms_instance_change";
+
+    /**
+     * token授权参数: 旧版本
+     */
+    public static Map initTokenParams(String access_token) {
+        return UtilMap.map("access_token", access_token);
+    }
+
+    /**
+     * token授权参数: 新版本
+     */
+    public static Map initTokenHeader(String access_token) {
+        return UtilMap.map("x-acs-dingtalk-access-token", access_token);
+    }
+}

+ 78 - 0
mjava/src/main/java/com/malk/server/dingtalk/DDConfigSign.java

@@ -0,0 +1,78 @@
+package com.malk.server.dingtalk;
+
+import lombok.SneakyThrows;
+
+import java.net.URL;
+import java.net.URLDecoder;
+import java.security.MessageDigest;
+import java.util.Formatter;
+import java.util.Random;
+
+/**
+ * 计算dd.config的签名参数
+ **/
+public class DDConfigSign {
+
+    /**
+     * 计算dd.config的签名参数
+     *
+     * @param jsticket  通过微应用appKey获取的jsticket
+     * @param nonceStr  自定义固定字符串
+     * @param timeStamp 当前时间戳
+     * @param url       调用dd.config的当前页面URL
+     */
+    @SneakyThrows
+    public static String sign(String jsticket, String nonceStr, long timeStamp, String url) {
+        String plain = "jsapi_ticket=" + jsticket + "&noncestr=" + nonceStr + "&timestamp=" + timeStamp + "&url=" + decodeUrl(url);
+        MessageDigest sha1 = MessageDigest.getInstance("SHA-256");
+        sha1.reset();
+        sha1.update(plain.getBytes("UTF-8"));
+        return byteToHex(sha1.digest());
+    }
+
+    // 字节数组转化成十六进制字符串
+    private static String byteToHex(final byte[] hash) {
+        Formatter formatter = new Formatter();
+        for (byte b : hash) {
+            formatter.format("%02x", b);
+        }
+        String result = formatter.toString();
+        formatter.close();
+        return result;
+    }
+
+    /**
+     * 因为ios端上传递的url是encode过的,android是原始的url。开发者使用的也是原始url,
+     * 所以需要把参数进行一般urlDecode
+     */
+    private static String decodeUrl(String url) throws Exception {
+        URL urler = new URL(url);
+        StringBuilder urlBuffer = new StringBuilder();
+        urlBuffer.append(urler.getProtocol());
+        urlBuffer.append(":");
+        if (urler.getAuthority() != null && urler.getAuthority().length() > 0) {
+            urlBuffer.append("//");
+            urlBuffer.append(urler.getAuthority());
+        }
+        if (urler.getPath() != null) {
+            urlBuffer.append(urler.getPath());
+        }
+        if (urler.getQuery() != null) {
+            urlBuffer.append('?');
+            urlBuffer.append(URLDecoder.decode(urler.getQuery(), "utf-8"));
+        }
+        return urlBuffer.toString();
+    }
+
+    /// test
+    public static String getRandomStr(int count) {
+        String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < count; i++) {
+            int number = random.nextInt(base.length());
+            sb.append(base.charAt(number));
+        }
+        return sb.toString();
+    }
+}

+ 79 - 0
mjava/src/main/java/com/malk/server/dingtalk/DDFormComponentDto.java

@@ -0,0 +1,79 @@
+package com.malk.server.dingtalk;
+
+import com.alibaba.fastjson.JSON;
+import com.malk.utils.UtilMap;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 钉钉组件要求
+ * -
+ * 1. 数字组件不能传null或空, 计算字段会自动计算, 不用传值有可. 但打印不支持会不显示
+ * 2. 撤回和提交字段必填设置, 接口调用也会受控. 但若发起页面只读, 审批节点必填则不影响
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DDFormComponentDto {
+
+    /**
+     * 组件名称
+     */
+    private String name;
+
+    /**
+     * 组件的值
+     */
+    private String value;
+
+    /**
+     * todo: 钉钉回调, 数字组件不能传null或空, 文本组件null过滤为空; 计算字段胡自动计算, 不用传值, 日期仅支持为年月日或年月日时分两种格式, 人员组件JSON.toJSONString(Arrays.asList(userId))))
+     * 快速格式化, 若value非直接取值需预处理好
+     *
+     * @param formData   表单数据源, 若Value类型为list, 则触发ruleDetail
+     * @param formRule   表单数据格式: { 字段名: 组件名 }
+     * @param detailRule 表单明细数据格式: 单子表 { 字段名: 组件名 }; 多明细 { 明细字段:  { 字段名: 组件名 } }, 明细字段保持和数据字段一致
+     */
+    public static List<DDFormComponentDto> formatComponentValues(Map<String, ?> formData, Map<String, String> formRule, Map detailRule) {
+        // 审批流表单参数,设置各表单项值
+        Map<String, String> ruleDetail = detailRule;
+        List<DDFormComponentDto> formComponentValues = new ArrayList<>();
+        for (String key : formRule.keySet()) {
+            if (formData.get(key) instanceof List) {
+                // 明细组件: 每一个组件都是集合, table为集合嵌套集合
+                List<List<DDFormComponentDto>> formComponentDetailsValues = new ArrayList<>();
+                List<Map> details = (List<Map>) formData.get(key);
+                if (detailRule.get(key) instanceof Map) {
+                    ruleDetail = (Map<String, String>) detailRule.get(key);
+                }
+                for (Map detail : details) {
+                    List<DDFormComponentDto> detailComponentValues = new ArrayList<>();
+                    for (String sub : ruleDetail.keySet()) {
+                        detailComponentValues.add(DDFormComponentDto.builder().name(ruleDetail.get(sub)).value(String.valueOf(detail.get(sub))).build());
+                    }
+                    formComponentDetailsValues.add(detailComponentValues);
+                }
+                formComponentValues.add(DDFormComponentDto.builder().name(formRule.get(key)).value(JSON.toJSONString(formComponentDetailsValues)).build());
+            } else {
+                formComponentValues.add(DDFormComponentDto.builder().name(formRule.get(key)).value(String.valueOf(formData.get(key))).build());
+            }
+        }
+        return formComponentValues;
+    }
+
+    /**
+     * 快速格式化, 上传釘盘的文件转为OA审批对象
+     */
+    public static String formatAttachment(Map dentry) {
+        Map data = UtilMap.map("spaceId, fileName, fileSize, fileType, fileId", "spaceId, name, size, extension, id", dentry);
+        return JSON.toJSONString(Arrays.asList(data));
+    }
+}

+ 24 - 0
mjava/src/main/java/com/malk/server/dingtalk/DDInterActiveCard.java

@@ -0,0 +1,24 @@
+package com.malk.server.dingtalk;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.malk.utils.UtilMap;
+import org.apache.commons.collections4.map.HashedMap;
+
+import java.util.Map;
+
+public class DDInterActiveCard {
+
+    /**
+     * 格式交互卡片, 表格数据类型 [兼容多表格], 格式详见 DDClient_Extension 发送卡片
+     */
+    public static Map formCardDataForTable(Map data, String... props) {
+
+        Map cardData = new HashedMap();
+        for (String prop : props) {
+            cardData.put(prop, UtilMap.map("data, meta", data.get(prop), data.get("meta")));
+        }
+        /// fastjson 避免循环引用: 当一个对象包含另一个对象时 或 当一个对象和另一个对象完全相同时
+        return UtilMap.map("cardParamMap", UtilMap.map("sys_full_json_obj", JSON.toJSONString(cardData, SerializerFeature.DisableCircularReferenceDetect)));
+    }
+}

+ 101 - 0
mjava/src/main/java/com/malk/server/dingtalk/DDR.java

@@ -0,0 +1,101 @@
+package com.malk.server.dingtalk;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class DDR<T> extends VenR {
+
+    // 请求状态
+    private boolean success;
+
+    private String errcode;
+
+    private String errmsg;
+
+    private T result;
+
+    /**
+     * token
+     */
+    private String accessToken;
+    private int expiresIn;
+
+    /**
+     * ticket
+     */
+    private String ticket;
+
+    /**
+     * 审批实例ID
+     */
+    private String processInstanceId;
+
+    /**
+     * 审批实例详情
+     */
+    private Map processInstance;
+
+    /**
+     * 回调失败事件
+     */
+    private List<Map> failedList;
+
+    private boolean hasMore;
+
+    private String corpid;
+
+    private List<String> userIdList;
+
+    private Long nextToken;
+
+    /**
+     * 发送工作通知
+     */
+    private String task_id; // 可调用获取工作通知消息的发送结果查询结果
+
+    /**
+     * 考勤打卡数据
+     */
+    private List<Map> recordresult;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "0";
+
+    // 创建用户邀请成功提示
+    private final static String USER_CREATE = "40103";
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+//        if (!hasMore && ObjectUtil.isNull(userIdList)){
+            McException.assertException(!errcode.equals(SUC_CODE) && !errcode.equals(USER_CREATE), errcode, errmsg, "dingtalk");
+//        }
+    }
+
+    /**
+     * 通用post请求
+     */
+    public static DDR doPost(String url, Map header, Map param, Map body) {
+        return (DDR) DDR.doPost(url, header, param, body, VenR.RC_DD);
+    }
+
+    /**
+     * 通用get请求
+     */
+    public static DDR doGet(String url, Map header, Map param) {
+        return (DDR) DDR.doGet(url, header, param, VenR.RC_DD);
+    }
+}

+ 144 - 0
mjava/src/main/java/com/malk/server/dingtalk/DDR_New.java

@@ -0,0 +1,144 @@
+package com.malk.server.dingtalk;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class DDR_New<T> extends VenR {
+
+    private String code;
+
+    private String message;
+
+    private Object data;
+
+    private boolean success;
+
+    private T result;
+
+    /**
+     * 无权限对应CODE
+     */
+    private Map accessdenieddetail;
+
+    /**
+     * 离职记录列表
+     */
+    private List<Map<String, String>> records;
+
+    /**
+     * 审批实例id
+     */
+    private String instanceId;
+
+    ////  宜搭数据  ////
+
+    /**
+     * 列表查询数据
+     */
+    private long pageNumber;
+
+    private long totalCount;
+
+    /**
+     * 实例ID详情
+     */
+    private Map originator;
+
+    private String modifiedTimeGMT;
+
+    private String formInstId;
+
+    private Map formData;
+
+    /**
+     * 变更记录
+     */
+    private Map operationLogMap;
+
+
+    ////  储存空间  ////
+
+    /**
+     * 上传唯一标识
+     */
+    private String uploadKey;
+
+    /**
+     * 文件存储类型。DINGTALK:钉钉统一存储驱动, ALIDOC:钉钉文档存储驱动, UNKNOWN:未知驱动
+     */
+    private String storageDriver;
+
+    /**
+     * 上传协议。HEADER_SIGNATURE:Header加签
+     */
+    private String protocol;
+
+    /**
+     * Header加签上传信息。说明: 当protocol参数传HEADER_SIGNATURE时,返回该字段
+     */
+    private Map headerSignatureInfo;
+
+    /**
+     * 文件信息
+     */
+    private Map dentry;
+
+    /**
+     * 钉盘: 下一页的游标,为空字符串则表示分页结束
+     */
+    private String nextToken;
+
+    /// 空间列表
+    private List<Map> spaces;
+
+    /// 文件或文件夹列表
+    private List<Map> dentries;
+
+
+    ////  专属钉  ////
+
+    // 避免无数据返回空
+    private List<Map> list = new ArrayList<>();
+
+    // 成功状态标记 [氚云]
+    private final static String SUC_CODE = "success";
+
+    /**
+     * 断言错误信息
+     * -
+     * 新版本: 若存在code则失败, 否则直接返回请求字段, 无状态包装 [已冗余全部字段]
+     */
+    @Override
+    public void assertSuccess() {
+        if (ObjectUtil.isNotNull(accessdenieddetail)) {
+            message = "没有调用该接口的权限: " + accessdenieddetail;
+        }
+        McException.assertException(ObjectUtil.isNotNull(code) && !SUC_CODE.equals(code), code, message, "dingtalk_new");
+    }
+
+    /**
+     * 通用post请求
+     */
+    public static DDR_New doPost(String url, Map header, Map param, Map body) {
+        return (DDR_New) DDR.doPost(url, header, param, body, VenR.RC_DD_New);
+    }
+
+    /**
+     * 通用get请求
+     */
+    public static DDR_New doGet(String url, Map header, Map param) {
+        return (DDR_New) DDR.doGet(url, header, param, VenR.RC_DD_New);
+    }
+}

+ 404 - 0
mjava/src/main/java/com/malk/server/dingtalk/crypto/DingCallbackCrypto.java

@@ -0,0 +1,404 @@
+package com.malk.server.dingtalk.crypto;
+
+import com.google.common.io.BaseEncoding;
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * 钉钉开放平台加解密方法
+ * 在ORACLE官方网站下载JCE无限制权限策略文件
+ * JDK6的下载地址:http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html
+ * JDK7的下载地址: http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html
+ * JDK8的下载地址 https://www.oracle.com/java/technologies/javase-jce8-downloads.html
+ */
+public class DingCallbackCrypto {
+
+    private static final Charset CHARSET = Charset.forName("utf-8");
+    private static final Base64 base64 = new Base64();
+    private byte[] aesKey;
+    private String token;
+    private String corpId;
+    /**
+     * ask getPaddingBytes key固定长度
+     **/
+    private static final Integer AES_ENCODE_KEY_LENGTH = 43;
+    /**
+     * 加密随机字符串字节长度
+     **/
+    private static final Integer RANDOM_LENGTH = 16;
+
+    /**
+     * 构造函数
+     *
+     * @param token          钉钉开放平台上,开发者设置的token
+     * @param encodingAesKey 钉钉开放台上,开发者设置的EncodingAESKey
+     * @param corpId         企业自建应用-事件订阅, 使用appKey
+     *                       企业自建应用-注册回调地址, 使用corpId
+     *                       第三方企业应用, 使用suiteKey
+     * @throws DingTalkEncryptException 执行失败,请查看该异常的错误码和具体的错误信息
+     */
+    public DingCallbackCrypto(String token, String encodingAesKey, String corpId) throws DingTalkEncryptException {
+        if (null == encodingAesKey || encodingAesKey.length() != AES_ENCODE_KEY_LENGTH) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.AES_KEY_ILLEGAL);
+        }
+        this.token = token;
+        this.corpId = corpId;
+        // ppExt: 23.10.26 钉钉新方式以Steam接入, HTTP形式commonsc-codec在升级之后,其内部做了一个validateCharacter校验. 使用 guava 替代
+        aesKey = BaseEncoding.base64().decode(encodingAesKey + "=");
+    }
+
+    public Map<String, String> getEncryptedMap(String plaintext) throws DingTalkEncryptException {
+        return getEncryptedMap(plaintext, System.currentTimeMillis(), Utils.getRandomStr(16));
+    }
+
+    /**
+     * 将和钉钉开放平台同步的消息体加密,返回加密Map
+     *
+     * @param plaintext 传递的消息体明文
+     * @param timeStamp 时间戳
+     * @param nonce     随机字符串
+     * @return
+     * @throws DingTalkEncryptException
+     */
+    public Map<String, String> getEncryptedMap(String plaintext, Long timeStamp, String nonce)
+            throws DingTalkEncryptException {
+        if (null == plaintext) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.ENCRYPTION_PLAINTEXT_ILLEGAL);
+        }
+        if (null == timeStamp) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.ENCRYPTION_TIMESTAMP_ILLEGAL);
+        }
+        if (null == nonce) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.ENCRYPTION_NONCE_ILLEGAL);
+        }
+        // 加密
+        String encrypt = encrypt(Utils.getRandomStr(RANDOM_LENGTH), plaintext);
+        String signature = getSignature(token, String.valueOf(timeStamp), nonce, encrypt);
+        Map<String, String> resultMap = new HashMap<String, String>();
+        resultMap.put("msg_signature", signature);
+        resultMap.put("encrypt", encrypt);
+        resultMap.put("timeStamp", String.valueOf(timeStamp));
+        resultMap.put("nonce", nonce);
+        return resultMap;
+    }
+
+    /**
+     * 密文解密
+     *
+     * @param msgSignature 签名串
+     * @param timeStamp    时间戳
+     * @param nonce        随机串
+     * @param encryptMsg   密文
+     * @return 解密后的原文
+     * @throws DingTalkEncryptException
+     */
+    public String getDecryptMsg(String msgSignature, String timeStamp, String nonce, String encryptMsg)
+            throws DingTalkEncryptException {
+        //校验签名
+        String signature = getSignature(token, timeStamp, nonce, encryptMsg);
+        if (!signature.equals(msgSignature)) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_SIGNATURE_ERROR);
+        }
+        // 解密
+        String result = decrypt(encryptMsg);
+        return result;
+    }
+
+    /*
+     * 对明文加密.
+     * @param text 需要加密的明文
+     * @return 加密后base64编码的字符串
+     */
+    private String encrypt(String random, String plaintext) throws DingTalkEncryptException {
+        try {
+            byte[] randomBytes = random.getBytes(CHARSET);
+            byte[] plainTextBytes = plaintext.getBytes(CHARSET);
+            byte[] lengthByte = Utils.int2Bytes(plainTextBytes.length);
+            byte[] corpidBytes = corpId.getBytes(CHARSET);
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+            byteStream.write(randomBytes);
+            byteStream.write(lengthByte);
+            byteStream.write(plainTextBytes);
+            byteStream.write(corpidBytes);
+            byte[] padBytes = PKCS7Padding.getPaddingBytes(byteStream.size());
+            byteStream.write(padBytes);
+            byte[] unencrypted = byteStream.toByteArray();
+            byteStream.close();
+            Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+            SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
+            IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16);
+            cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
+            byte[] encrypted = cipher.doFinal(unencrypted);
+            String result = base64.encodeToString(encrypted);
+            return result;
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_ENCRYPT_TEXT_ERROR);
+        }
+    }
+
+    /*
+     * 对密文进行解密.
+     * @param text 需要解密的密文
+     * @return 解密得到的明文
+     */
+    private String decrypt(String text) throws DingTalkEncryptException {
+        byte[] originalArr;
+        try {
+            // 设置解密模式为AES的CBC模式
+            Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+            SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
+            IvParameterSpec iv = new IvParameterSpec(Arrays.copyOfRange(aesKey, 0, 16));
+            cipher.init(Cipher.DECRYPT_MODE, keySpec, iv);
+            // 使用BASE64对密文进行解码
+            byte[] encrypted = Base64.decodeBase64(text);
+            // 解密
+            originalArr = cipher.doFinal(encrypted);
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_DECRYPT_TEXT_ERROR);
+        }
+
+        String plainText;
+        String fromCorpid;
+        try {
+            // 去除补位字符
+            byte[] bytes = PKCS7Padding.removePaddingBytes(originalArr);
+            // 分离16位随机字符串,网络字节序和corpId
+            byte[] networkOrder = Arrays.copyOfRange(bytes, 16, 20);
+            int plainTextLegth = Utils.bytes2int(networkOrder);
+            plainText = new String(Arrays.copyOfRange(bytes, 20, 20 + plainTextLegth), CHARSET);
+            fromCorpid = new String(Arrays.copyOfRange(bytes, 20 + plainTextLegth, bytes.length), CHARSET);
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_DECRYPT_TEXT_LENGTH_ERROR);
+        }
+
+        // corpid不相同的情况
+        if (!fromCorpid.equals(corpId)) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_DECRYPT_TEXT_CORPID_ERROR);
+        }
+        return plainText;
+    }
+
+    /**
+     * 数字签名
+     *
+     * @param token     isv token
+     * @param timestamp 时间戳
+     * @param nonce     随机串
+     * @param encrypt   加密文本
+     * @return
+     * @throws DingTalkEncryptException
+     */
+    public String getSignature(String token, String timestamp, String nonce, String encrypt)
+            throws DingTalkEncryptException {
+        try {
+            String[] array = new String[]{token, timestamp, nonce, encrypt};
+            Arrays.sort(array);
+//            System.out.println(JSON.toJSONString(array));
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i < 4; i++) {
+                sb.append(array[i]);
+            }
+            String str = sb.toString();
+//            System.out.println(str);
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            md.update(str.getBytes());
+            byte[] digest = md.digest();
+
+            StringBuffer hexstr = new StringBuffer();
+            String shaHex = "";
+            for (int i = 0; i < digest.length; i++) {
+                shaHex = Integer.toHexString(digest[i] & 0xFF);
+                if (shaHex.length() < 2) {
+                    hexstr.append(0);
+                }
+                hexstr.append(shaHex);
+            }
+            return hexstr.toString();
+        } catch (Exception e) {
+            throw new DingTalkEncryptException(DingTalkEncryptException.COMPUTE_SIGNATURE_ERROR);
+        }
+    }
+
+    public static class Utils {
+        public Utils() {
+        }
+
+        public static String getRandomStr(int count) {
+            String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+            Random random = new Random();
+            StringBuffer sb = new StringBuffer();
+
+            for (int i = 0; i < count; ++i) {
+                int number = random.nextInt(base.length());
+                sb.append(base.charAt(number));
+            }
+
+            return sb.toString();
+        }
+
+        public static byte[] int2Bytes(int count) {
+            byte[] byteArr = new byte[]{(byte) (count >> 24 & 255), (byte) (count >> 16 & 255), (byte) (count >> 8 & 255),
+                    (byte) (count & 255)};
+            return byteArr;
+        }
+
+        public static int bytes2int(byte[] byteArr) {
+            int count = 0;
+
+            for (int i = 0; i < 4; ++i) {
+                count <<= 8;
+                count |= byteArr[i] & 255;
+            }
+
+            return count;
+        }
+    }
+
+    public static class PKCS7Padding {
+        private static final Charset CHARSET = Charset.forName("utf-8");
+        private static final int BLOCK_SIZE = 32;
+
+        public PKCS7Padding() {
+        }
+
+        public static byte[] getPaddingBytes(int count) {
+            int amountToPad = 32 - count % 32;
+            if (amountToPad == 0) {
+                amountToPad = 32;
+            }
+
+            char padChr = chr(amountToPad);
+            String tmp = new String();
+
+            for (int index = 0; index < amountToPad; ++index) {
+                tmp = tmp + padChr;
+            }
+
+            return tmp.getBytes(CHARSET);
+        }
+
+        public static byte[] removePaddingBytes(byte[] decrypted) {
+            int pad = decrypted[decrypted.length - 1];
+            if (pad < 1 || pad > 32) {
+                pad = 0;
+            }
+
+            return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
+        }
+
+        private static char chr(int a) {
+            byte target = (byte) (a & 255);
+            return (char) target;
+        }
+    }
+
+    public static class DingTalkEncryptException extends Exception {
+        public static final int SUCCESS = 0;
+        public static final int ENCRYPTION_PLAINTEXT_ILLEGAL = 900001;
+        public static final int ENCRYPTION_TIMESTAMP_ILLEGAL = 900002;
+        public static final int ENCRYPTION_NONCE_ILLEGAL = 900003;
+        public static final int AES_KEY_ILLEGAL = 900004;
+        public static final int SIGNATURE_NOT_MATCH = 900005;
+        public static final int COMPUTE_SIGNATURE_ERROR = 900006;
+        public static final int COMPUTE_ENCRYPT_TEXT_ERROR = 900007;
+        public static final int COMPUTE_DECRYPT_TEXT_ERROR = 900008;
+        public static final int COMPUTE_DECRYPT_TEXT_LENGTH_ERROR = 900009;
+        public static final int COMPUTE_DECRYPT_TEXT_CORPID_ERROR = 900010;
+        private static final long serialVersionUID = 4139585721260116198L;
+        private static Map<Integer, String> msgMap = new HashMap();
+        private Integer code;
+
+        static {
+            msgMap.put(0, "成功");
+            msgMap.put(900001, "加密明文文本非法");
+            msgMap.put(900002, "加密时间戳参数非法");
+            msgMap.put(900003, "加密随机字符串参数非法");
+            msgMap.put(900005, "签名不匹配");
+            msgMap.put(900006, "签名计算失败");
+            msgMap.put(900004, "不合法的aes key");
+            msgMap.put(900007, "计算加密文字错误");
+            msgMap.put(900008, "计算解密文字错误");
+            msgMap.put(900009, "计算解密文字长度不匹配");
+            msgMap.put(900010, "计算解密文字corpid不匹配");
+        }
+
+        public Integer getCode() {
+            return this.code;
+        }
+
+        public DingTalkEncryptException(Integer exceptionCode) {
+            super((String) msgMap.get(exceptionCode));
+            this.code = exceptionCode;
+        }
+    }
+
+    static {
+        try {
+            Security.setProperty("crypto.policy", "limited");
+            RemoveCryptographyRestrictions();
+        } catch (Exception var1) {
+        }
+
+    }
+
+    private static void RemoveCryptographyRestrictions() throws Exception {
+        Class<?> jceSecurity = getClazz("javax.crypto.JceSecurity");
+        Class<?> cryptoPermissions = getClazz("javax.crypto.CryptoPermissions");
+        Class<?> cryptoAllPermission = getClazz("javax.crypto.CryptoAllPermission");
+        if (jceSecurity != null) {
+            setFinalStaticValue(jceSecurity, "isRestricted", false);
+            PermissionCollection defaultPolicy = (PermissionCollection) getFieldValue(jceSecurity, "defaultPolicy", (Object) null, PermissionCollection.class);
+            if (cryptoPermissions != null) {
+                Map<?, ?> map = (Map) getFieldValue(cryptoPermissions, "perms", defaultPolicy, Map.class);
+                map.clear();
+            }
+
+            if (cryptoAllPermission != null) {
+                Permission permission = (Permission) getFieldValue(cryptoAllPermission, "INSTANCE", (Object) null, Permission.class);
+                defaultPolicy.add(permission);
+            }
+        }
+
+    }
+
+    private static Class<?> getClazz(String className) {
+        Class clazz = null;
+
+        try {
+            clazz = Class.forName(className);
+        } catch (Exception var3) {
+        }
+
+        return clazz;
+    }
+
+    private static void setFinalStaticValue(Class<?> srcClazz, String fieldName, Object newValue) throws Exception {
+        Field field = srcClazz.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        Field modifiersField = Field.class.getDeclaredField("modifiers");
+        modifiersField.setAccessible(true);
+        modifiersField.setInt(field, field.getModifiers() & -17);
+        field.set((Object) null, newValue);
+    }
+
+    private static <T> T getFieldValue(Class<?> srcClazz, String fieldName, Object owner, Class<T> dstClazz) throws Exception {
+        Field field = srcClazz.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return dstClazz.cast(field.get(owner));
+    }
+
+}

+ 42 - 0
mjava/src/main/java/com/malk/server/ekuaibao/EKBConf.java

@@ -0,0 +1,42 @@
+package com.malk.server.ekuaibao;
+
+import com.alibaba.fastjson.JSON;
+import com.malk.utils.UtilHttp;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 读取配置文件参考FilePah
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "ekuaibao")
+public class EKBConf {
+
+    // 易快报 corpId
+    private String corpId;
+
+    // 易快报不同平台获取前缀的方式不同
+    private String platformApi;
+
+    private String appKey;
+
+    private String appSecurity;
+
+    /**
+     * 获取地址前缀
+     */
+    private static String platformUrl;
+
+    public String getPlatformUrl() {
+        if (StringUtils.isBlank(platformUrl)) {
+            String rsp = UtilHttp.doGet(platformApi + "/api/openapi/v2/location?corpId=" + corpId, null, (Map) null);
+            platformUrl = String.valueOf(((Map) JSON.parse(rsp)).get("value"));
+        }
+        return platformUrl;
+    }
+}

+ 56 - 0
mjava/src/main/java/com/malk/server/ekuaibao/EKBR.java

@@ -0,0 +1,56 @@
+package com.malk.server.ekuaibao;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class EKBR extends VenR {
+
+    private String errorCode;
+
+    private String errorMessage;
+
+    /**
+     * 返回数据
+     */
+    private List<Map> items;
+
+    /**
+     * 单据详情
+     */
+    private Map value;
+
+    /**
+     * 创建单据
+     */
+    Map flow;
+
+    int type;
+
+    /**
+     * 单据数量
+     */
+    long count;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "0";
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(ObjectUtil.isNotNull(errorCode) && !errorCode.equals(SUC_CODE), errorCode, errorMessage, "ekuaibao");
+    }
+}
+

+ 24 - 0
mjava/src/main/java/com/malk/server/fxiaoke/FXKConf.java

@@ -0,0 +1,24 @@
+package com.malk.server.fxiaoke;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取配置文件参考FilePah
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "fxiaoke")
+public class FXKConf {
+
+    /// 纷享销客 corpId
+    private String corpId;
+
+    private String appId;
+
+    private String appSecret;
+
+    /// 永久授权码
+    private String permanentCode;
+}

+ 67 - 0
mjava/src/main/java/com/malk/server/fxiaoke/FXXR.java

@@ -0,0 +1,67 @@
+package com.malk.server.fxiaoke;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.malk.utils.UtilHttp;
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class FXXR extends VenR {
+
+    private String errorCode;
+
+    private String errorMessage;
+
+    private String errorDescription;
+
+    /**
+     * token 接口
+     */
+    private String corpAccessToken;
+    private int expiresIn;
+
+    /**
+     * 员工信息
+     */
+    private List<Map> empList;
+
+    /**
+     * 外勤数据
+     */
+    private List<Map> datas;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "0";
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(ObjectUtil.isNotNull(errorCode) && !errorCode.equals(SUC_CODE), errorCode, errorDescription, "fxiaoke");
+    }
+
+    /**
+     * 通用post请求
+     */
+    public static FXXR doPost(String url, Map header, Map param, Map body) {
+        return (FXXR) UtilHttp.doPost(url, header, param, body, FXXR.class);
+    }
+
+    /**
+     * 通用get请求
+     */
+    public static FXXR doGet(String url, Map header, Map param) {
+        return (FXXR) UtilHttp.doGet(url, header, param, FXXR.class);
+    }
+}
+

+ 59 - 0
mjava/src/main/java/com/malk/server/h3yun/CYConf.java

@@ -0,0 +1,59 @@
+package com.malk.server.h3yun;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "h3yun")
+@Slf4j
+public class CYConf {
+
+    private String engineCode;
+
+    private String secret;
+    
+    /////////////////////////////// 静态方法 ///////////////////////////////
+
+    // 按钮动作
+    public enum ACTION_NAME {
+
+        Reject("Reject"),                   // 拒绝
+        Save("Save"),                       // 暂存
+        Forward("Forward"),                 // 转交
+        Remove("Remove"),                   // 删除
+        Submit("Submit"),                   // 提交/同意 [区分是否审批节点]
+        ForComment("ForComment"),           // 前加签
+        TempAddition("TempAddition"),       // 后加签
+        CancelInstance("CancelInstance");    // 作废 [退回不触发, 退回至发起节点, 可激活作废按钮]
+
+        @Getter
+        private String desc;
+
+        ACTION_NAME(String desc) {
+            this.desc = desc;
+        }
+    }
+
+    public static boolean isSubmit(String actionName) {
+        return actionName.equals(ACTION_NAME.Submit.desc);
+    }
+
+    public static boolean isReject(String actionName) {
+        return actionName.equals(ACTION_NAME.Reject.desc);
+    }
+
+    public static boolean isRemove(String actionName) {
+        return actionName.equals(ACTION_NAME.Remove.desc);
+    }
+
+    /**
+     * 获取原附件预览地址 [只能作为在线预览, 接口传递无登录态]
+     */
+    public static final String getAttachmentPreviewUrl(String attachmentId) {
+        return "https://www.h3yun.com/Form/DoPreview/?attachmentId=" + attachmentId;
+    }
+}

+ 90 - 0
mjava/src/main/java/com/malk/server/teambition/TBConf.java

@@ -0,0 +1,90 @@
+package com.malk.server.teambition;
+
+import com.malk.utils.UtilMap;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * 读取配置文件参考FilePah
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "teambition")
+public class TBConf {
+
+    private String AppID;
+
+    private String AppSecret;
+
+    private String TenantId;
+
+    private String OperatorId;
+
+    private String ApiHost;
+
+    public String getApiHost() {
+        if (StringUtils.isNotBlank(ApiHost)) {
+            return ApiHost;
+        }
+        return "https://open.teambition.com/api"; // 公有云环境
+    }
+
+    /**
+     * 一个分页数量上限 [上限 1000]
+     */
+    public static final Integer PAGE_SIZE_LIMIT = 1000;
+
+    /**
+     * 租户类型: 默认是组织
+     */
+    public static final String TENANT_TYPE = "organization";
+
+    /**
+     * 推送事件验证
+     */
+    public static final String EVENT_VERIFY_HOOK = "VERIFY_HOOK";
+
+    /// 获取任务字段值
+    public static List<Map> getTaskFieldValue(List<Map> customfields, String fieldId) {
+
+        Optional optional = customfields.stream().filter(item -> fieldId.equals(item.get("cfId"))).findAny();
+        if (optional.isPresent()) {
+            return UtilMap.getList((Map) optional.get(), "value");
+        }
+        return Arrays.asList();
+    }
+
+    /// 获取任务字段集合第一个值
+    public static String getTaskFieldValue_First(List<Map> customfields, String fieldId) {
+
+        List<Map> value = getTaskFieldValue(customfields, fieldId);
+        if (value.size() > 0) {
+            return String.valueOf(value.get(0).get("title"));
+        }
+        return "";
+    }
+
+    /// 更新任务自定义字段值 [ppExt: 富文本不能解析, 知识库可写入]
+    public static Map assembleCustomField(String fieldName, String fieldValue, String value, Object meta) {
+        Map body = UtilMap.map(fieldName, fieldValue);
+        Map data = UtilMap.map("title", (Object) value);
+        UtilMap.putNotNull(data, "meta", meta);
+        body.put("value", Arrays.asList(data));
+        return body;
+    }
+
+    public static Map assembleCustomFieldName(String fieldValue, String value) {
+        return assembleCustomField("customfieldName", fieldValue, value, null);
+    }
+
+    public static Map assembleCustomFieldId(String fieldValue, String value) {
+        return assembleCustomField("customfieldId", fieldValue, value, null);
+    }
+}

+ 38 - 0
mjava/src/main/java/com/malk/server/teambition/TBR.java

@@ -0,0 +1,38 @@
+package com.malk.server.teambition;
+
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class TBR<T> extends VenR {
+
+    private String code;
+
+    private String errorMessage;
+
+    /**
+     * 接口返回数据
+     */
+    private T result;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "200";
+
+    // ppExt: 204为重复修改或tb设置了不允许修改规则
+    private final static String NOR_CODE = "204";
+
+    private String nextPageToken;
+
+    private long totalSize;
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(!(code.equals(SUC_CODE) || code.equals(NOR_CODE)), code, errorMessage, "TB");
+    }
+}

+ 26 - 0
mjava/src/main/java/com/malk/server/vika/VKConf.java

@@ -0,0 +1,26 @@
+package com.malk.server.vika;
+
+import com.malk.utils.UtilMap;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 读取配置文件参考FilePah
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "vika")
+public class VKConf {
+
+    private String apiToken;
+
+    /**
+     * api token授权参数
+     */
+    public Map initTokenHeader() {
+        return UtilMap.map("Authorization", "Bearer " + apiToken);
+    }
+}

+ 34 - 0
mjava/src/main/java/com/malk/server/vika/VKR.java

@@ -0,0 +1,34 @@
+package com.malk.server.vika;
+
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class VKR<T> extends VenR {
+
+
+    private int code;
+
+    private String message;
+
+    private boolean success;
+
+    private T data;
+
+    // 成功状态标记
+    private final static int SUC_CODE = 200;
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(code != SUC_CODE || !isSuccess(), String.valueOf(code), message, "vika");
+    }
+}

+ 65 - 0
mjava/src/main/java/com/malk/server/xbongbong/DigestUtil.java

@@ -0,0 +1,65 @@
+package com.malk.server.xbongbong;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * 签名工具类
+ */
+public class DigestUtil {
+
+    /**
+     * parameter strSrc is a string will be encrypted,
+     * parameter encName is the algorithm name will be used.
+     * encName dafault to "MD5"
+     *
+     * @throws UnsupportedEncodingException
+     */
+    public static String Encrypt(String strSrc, String encName) {
+        MessageDigest md = null;
+        String strDes = null;
+        
+        try {
+            byte[] bt = strSrc.getBytes("utf-8");
+            if (encName == null || encName.equals("")) {
+                encName = "MD5";
+            }
+            md = MessageDigest.getInstance(encName);
+            md.update(bt);
+            strDes = bytes2Hex(md.digest()); // to HexString
+        } catch (UnsupportedEncodingException e) {
+            System.out.println("UnsupportedEncodingException.");
+            return null;
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println("Invalid algorithm.");
+            return null;
+        }
+        return strDes;
+    }
+
+    public static String bytes2Hex(byte[] bts) {
+        String des = "";
+        String tmp = null;
+        for (int i = 0; i < bts.length; i++) {
+            tmp = (Integer.toHexString(bts[i] & 0xFF));
+            if (tmp.length() == 1) {
+                des += "0";
+            }
+            des += tmp;
+        }
+        return des;
+    }
+
+    public static void main(String[] args) throws UnsupportedEncodingException {
+        String strSrc = "可以加密汉字.Oh,and english";
+
+        System.out.println("Source String:" + strSrc);
+        System.out.println("Encrypted String:");
+        System.out.println("Use Def:" + DigestUtil.Encrypt(strSrc, null));
+        System.out.println("Use MD5:" + DigestUtil.Encrypt(strSrc, "MD5"));
+        System.out.println("Use SHA-1:" + DigestUtil.Encrypt(strSrc, "SHA-1"));
+        System.out.println("Use SHA-256:" + DigestUtil.Encrypt(strSrc, "SHA-256"));
+    }
+
+}

+ 59 - 0
mjava/src/main/java/com/malk/server/xbongbong/XBBConf.java

@@ -0,0 +1,59 @@
+package com.malk.server.xbongbong;
+
+
+import com.malk.utils.UtilMap;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 读取配置文件参考FilePah
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "xbongbong")
+public class XBBConf {
+
+    /**
+     * 公司corpid。接口基础参数,接口请求必传
+     */
+    private String corpid;
+
+
+    /**
+     * 访问接口的token,该值相当于密钥
+     * 管理员账号登录销帮帮WEB版后台后,访问https://pfweb.xbongbong.com/#/apiToken/index查看
+     */
+    private String token;
+
+    /**
+     * 接口操作人userId,接口基础参数。不传默认取超管角色
+     */
+    private String userId;
+
+    /**
+     * 回调解析token
+     */
+    private String callbackToken;
+
+    /**
+     * 获取查询条件
+     *
+     * @implSpec 查询时间条件为秒级; 查询条件值为集合类型, 若是区间通过指定range, 值依然是集合.
+     * @apiNote https://profapi.xbongbong.com/#/params?anchor=%E5%85%A5%E5%8F%82%E8%AF%B4%E6%98%8E
+     */
+    public static final Map getConditionMap(String attr, String symbol, Object... values) {
+        return UtilMap.map("attr, symbol, value", attr, symbol, Arrays.asList(values));
+    }
+
+    /// API
+    public static final String API_LIST_customer = "https://proapi.xbongbong.com/pro/v2/api/customer/list"; // 客户列表
+    public static final String API_LIST_contract = "https://proapi.xbongbong.com/pro/v2/api/contract/list"; // 合同列表
+    public static final String API_LIST_communicate = "https://proapi.xbongbong.com/pro/v2/api/communicate/list"; // 跟进记录
+    public static final String API_LIST_opportunity = "https://proapi.xbongbong.com/pro/v2/api/opportunity/list"; // 销售机会
+    public static final String API_LIST_paymentSheet = "https://proapi.xbongbong.com/pro/v2/api/paymentSheet/list"; // 回款单
+
+}

+ 33 - 0
mjava/src/main/java/com/malk/server/xbongbong/XBBR.java

@@ -0,0 +1,33 @@
+package com.malk.server.xbongbong;
+
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class XBBR<T> extends VenR {
+
+    private boolean success;
+
+    private String code;
+
+    private String msg;
+
+    private T result;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "1";
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(!code.equals(SUC_CODE) || !success, code, msg, "xbongbong");
+    }
+}

+ 27 - 0
mjava/src/main/java/com/malk/service/aliwork/YDClient.java

@@ -0,0 +1,27 @@
+package com.malk.service.aliwork;
+
+
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.dingtalk.DDR_New;
+
+public interface YDClient {
+
+    /**
+     * 操作数据
+     */
+    Object operateData(YDParam param, YDConf.FORM_OPERATION type);
+
+    /**
+     * 查询数据
+     */
+    DDR_New queryData(YDParam param, YDConf.FORM_QUERY type);
+
+    /**
+     * w
+     * 获取宜搭附件临时免登地址
+     */
+    String convertTemporaryUrl(String url, int timeout);
+
+    String convertTemporaryUrl(String url);
+}

+ 100 - 0
mjava/src/main/java/com/malk/service/aliwork/YDService.java

@@ -0,0 +1,100 @@
+package com.malk.service.aliwork;
+
+
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+
+import java.util.List;
+import java.util.Map;
+
+public interface YDService {
+
+    // todo: 批量创建接口异常; 查询子表超过50自动查询全量; 查询表单全部数据, 避免第一次重复查询优化, 添加直接返回formData, 兼容formInstId;  upsert方法
+
+    // todo 0402 批量更新 / 删除
+
+    /**
+     * 操作数据 [异步]
+     */
+    Object operateData(YDParam param, YDConf.FORM_OPERATION type);
+
+    /**
+     * 操作数据 [异步]
+     */
+    Object operateData2(Map data, Map update, YDParam param, YDConf.FORM_OPERATION type);
+
+    /**
+     * 查询数据 [子表] todo 参数控制
+     * <p>
+     * .formUuid("FORM-TD966Z81I9ODTCY66GH345S03VW03JJF6EQLL5")
+     * .formInstanceId(data.get("formInstanceId").toString())
+     * .tableFieldId("tableField_llqe7fgb")
+     */
+    List<Map> queryDetails(YDParam ydParam);
+
+    /**
+     * 查询全部 [主表] todo 合并formData, 或data, putAll
+     * <p>
+     * .stream().map(item -> {
+     * item.putAll( (Map) item.get("formData"));
+     * return item;
+     * }).collect(Collectors.toList());
+     */
+    List<Map> queryAllFormData(YDParam YDParam);
+
+    // todo: 宜搭大数据量处理会有异常, 可结合排序, 或失败记录进行处理 (避免更新后, 数据重新查询排序导致未全量同步)
+    List<Map> queryFormData_all(YDParam YDParam);
+
+    // ppExt: 查询100后再进分页, 且转为formData内数据, todo Process待完成 [bug]
+    List<Map> queryFormData_all_advance(YDParam ydParam, YDConf.FORM_QUERY type);
+
+    /**
+     * 查询宜搭数据
+     */
+    List<Map> queryDataList_FormData(String formUuid, Map conditions);
+
+    /**
+     * 查询宜搭数据 [精确匹配]
+     */
+    List queryFormData(String formUuid, String conditions);
+
+    /**
+     * 字段复制 [服务注册传递参数都是 string 格式]
+     * -
+     * fixme: 服务注册
+     * 1. 在提交校验,因为数据还未执行, 除 #{_yida_all_data} 外,绝大部分字段都是为空,且若是子表字段数据:会拆为为单一字段,数据为该字段下明细数据数组
+     * 2. 但在在业务规则内配置,可以正常获取. 若是子表单, 除返回提交下该字段明细数据数组外, 也会返回子表组件, 及子表内对应的数据 [可有效避免触发何查询操作]
+     * 业务规则场景: 若是写入关联表单,自关联后,通过自动化传递。若是数据全表复制,可获取全量数据进行写入操作
+     * ppExt: 组件格式
+     * 1. { "cur": "目标表, 主表组件ID[包含子表组件ID]", "src": "当前表, 主表组件ID[包含子表组件ID]", "子表组件ID + cur/src": "子表内的组件ID" }
+     * 2. 所有组件通过英文逗号 + 空格区分, 子表组件为避免组件id相同但子表内组件不一致的情况, 在单独子表组件ID后添加 src/cur 区分来源
+     */
+    Object copyFormData(Map data);
+
+    /**
+     * 全表复制 [两张表组件完全一致]
+     */
+    Object mirrorFormData(String instanceId, String formUuid, String processCode, Map updateData, String updateInstanceId);
+
+    /**
+     * upsert方法 [todo: 优化 批量的数据兼容]
+     *
+     * @param lambda 查询数据回调, 传递查询结果list, 接收回调返回map传递钉到formData内, 若返回为空则不支持Upsert
+     */
+    Object upsertFormData(String formUuid, Map condition, Map formData, UpsertLambda lambda);
+
+    /**
+     * ppExt 函数式编程:Stream类、Lambda表达式和函数接口(Functional Inteface)
+     * -
+     * 自定义Lambda是为了更好的代码提示和数据类型定义: @FunctionalInterface,该接口为函数接口,一个函数接口只能存在一个方法
+     * 特别注意,非异步情况下,和网络请求一致,回调默认同步等待【回调方式可自定义:如兼容并发可有,同步单次回调、同步累积回调、并发异步执行、并发累积回调】
+     * 函数编程的最大好处,是可传入执行逻辑,而无需等待全部数据结果,尤其并发和异步情况下【异步效果优于Future】
+     * -
+     * 结合异步与并发, @Async说明和配置详见core/AsyncConfig
+     */
+    @FunctionalInterface
+    interface UpsertLambda {
+        Map dataList(List<Map> list);
+    }
+
+}

+ 148 - 0
mjava/src/main/java/com/malk/service/aliwork/impl/YDClientImpl.java

@@ -0,0 +1,148 @@
+package com.malk.service.aliwork.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.dingtalk.DDR_New;
+import com.malk.service.aliwork.YDClient;
+import com.malk.service.dingtalk.DDClient;
+import com.malk.utils.UtilHttp;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class YDClientImpl implements YDClient {
+
+    @Autowired
+    private YDConf ydConf;
+
+    @Autowired
+    private DDClient ddClient;
+
+    // 初始化请求参数
+    Map _initBodyParam(YDParam ydParam) {
+        if (StringUtils.isBlank(ydParam.getUserId())) {
+            ydParam.setUserId(YDConf.PUB_ACCOUNT);
+        }
+        // 配置宜搭请求参数: appType, systemToken
+        if (StringUtils.isBlank(ydParam.getAppType()) || ydParam.getAppType().equals(ydConf.getAppType())) {
+            ydParam.setAppType(ydConf.getAppType());
+            ydParam.setSystemToken(ydConf.getSystemToken());
+        }
+        return JSONObject.parseObject(JSONObject.toJSONString(ydParam), Map.class);
+    }
+
+    // 请求地址 [拼接]
+    private String getRequestUrl(String uri) {
+        return "https://api.dingtalk.com/v1.0/yida" + uri;
+    }
+
+    // 请求地址 [实例]
+    private String getRequestUrl(String uri, String instanceId) {
+        return getRequestUrl(uri) + "/" + instanceId;
+    }
+
+    /**
+     * 操作数据
+     */
+    @Override
+    public Object operateData(YDParam ydParam, YDConf.FORM_OPERATION type) {
+        DDR_New ddr_new = null;
+        Map bodys = _initBodyParam(ydParam);
+        switch (type) {
+            case create:
+                ddr_new = (DDR_New) UtilHttp.doPost(getRequestUrl("/forms/instances"), ddClient.initTokenHeader(), bodys, DDR_New.class);
+                break;
+            case update:
+                ddr_new = (DDR_New) UtilHttp.doPut(getRequestUrl("/forms/instances"), ddClient.initTokenHeader(), bodys, DDR_New.class);
+                break;
+            case delete:
+                ddr_new = (DDR_New) UtilHttp.doDelete(getRequestUrl("/forms/instances"), ddClient.initTokenHeader(), bodys, DDR_New.class);
+                break;
+            case start:
+                ddr_new = (DDR_New) UtilHttp.doPost(getRequestUrl("/processes/instances/start"), ddClient.initTokenHeader(), bodys, DDR_New.class);
+                break;
+            case delete_batch:
+                ddr_new = (DDR_New) UtilHttp.doPost(getRequestUrl("/forms/instances/batchRemove"), ddClient.initTokenHeader(), bodys, DDR_New.class);
+                break;
+            case multi_update:
+                ddr_new = (DDR_New) UtilHttp.doPut(getRequestUrl("/forms/instances/components"), ddClient.initTokenHeader(), bodys, DDR_New.class);
+                break;
+            case batchSave:
+                ddr_new = (DDR_New) UtilHttp.doPost(getRequestUrl("/forms/instances/batchSave"), ddClient.initTokenHeader(), null, _initBodyParam(ydParam), DDR_New.class);
+                break;
+            default:
+                break;
+        }
+        return ddr_new.getResult();
+    }
+
+    /**
+     * 查询数据
+     *
+     * @apiNote
+     */
+    @Override
+    public DDR_New queryData(YDParam ydParam, YDConf.FORM_QUERY type) {
+        DDR_New ddr_new = null;
+        Map param = _initBodyParam(ydParam);
+        switch (type) {
+            case retrieve_list_all:
+                ddr_new = DDR_New.doPost(getRequestUrl("/forms/instances/advances/queryAll"), ddClient.initTokenHeader(), null, param);
+                break;
+            case retrieve_list:
+                ddr_new = DDR_New.doPost(getRequestUrl("/forms/instances/advances/query"), ddClient.initTokenHeader(), null, param);
+                break;
+            case retrieve_id:
+                ddr_new = DDR_New.doGet(getRequestUrl("/forms/instances", ydParam.getFormInstanceId()), ddClient.initTokenHeader(), param);
+                break;
+            case retrieve_search_process:
+                ddr_new = DDR_New.doPost(getRequestUrl("/processes/instances"), ddClient.initTokenHeader(), param, param);
+                break;
+
+            case retrieve_search_process_id:
+                ddr_new = DDR_New.doPost(getRequestUrl("/processes/instanceIds", ydParam.getProcessInstanceId()), ddClient.initTokenHeader(), param, param);
+                break;
+
+            case retrieve_search_form:
+                ddr_new = DDR_New.doPost(getRequestUrl("/forms/instances/search"), ddClient.initTokenHeader(), null, param);
+                break;
+
+            case retrieve_search_form_id:
+                ddr_new = DDR_New.doPost(getRequestUrl("/forms/instances/ids") + "/" + ydParam.getAppType() + "/" + ydParam.getFormUuid(), ddClient.initTokenHeader(), param, param);
+                break;
+
+            case retrieve_details:
+                ddr_new = DDR_New.doGet(getRequestUrl("/forms/innerTables", ydParam.getFormInstanceId()), ddClient.initTokenHeader(), param);
+                break;
+            case retrieve_changed:
+                ddr_new = DDR_New.doPost(getRequestUrl("/forms/operationsLogs/query"), ddClient.initTokenHeader(), null, param);
+                break;
+        }
+        return ddr_new;
+    }
+
+    /**
+     * 临时免登地址
+     */
+    @Override
+    public String convertTemporaryUrl(String url, int timeout) {
+        Map param = new HashMap();
+        param.put("systemToken", ydConf.getSystemToken());
+        param.put("userId", YDConf.PUB_ACCOUNT);
+        param.put("fileUrl", url);          // URL在param上时, 需要编码 [UtilHttp已经做了编码] - URLEncoder.encode(url, "UTF-8")
+        param.put("timeout", timeout);      // 默认1分钟, 最大24小时 [毫秒]
+        return (String) DDR_New.doGet("https://api.dingtalk.com/v1.0/yida/apps/temporaryUrls/" + ydConf.getAppType(), ddClient.initTokenHeader(), param).getResult();
+    }
+
+    @Override
+    public String convertTemporaryUrl(String url) {
+        return convertTemporaryUrl(url, 60000);
+    }
+}

+ 330 - 0
mjava/src/main/java/com/malk/service/aliwork/impl/YDServiceImpl.java

@@ -0,0 +1,330 @@
+package com.malk.service.aliwork.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McException;
+import com.malk.server.dingtalk.DDR_New;
+import com.malk.service.aliwork.YDClient;
+import com.malk.service.aliwork.YDService;
+import com.malk.utils.UtilMap;
+import com.malk.utils.UtilString;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class YDServiceImpl implements YDService {
+
+    @Autowired
+    private YDClient ydClient;
+
+    /**
+     * 操作数据 [异步] - 审批通过立即更新, 会无效
+     */
+    @Async
+    @SneakyThrows
+    @Override
+    public Object operateData(YDParam ydParam, YDConf.FORM_OPERATION type) {
+        Thread.sleep(3000);
+        return ydClient.operateData(ydParam, type);
+    }
+
+    @Async
+    @SneakyThrows
+    @Override
+    public Object operateData2(Map data, Map update, YDParam ydParam, YDConf.FORM_OPERATION type) {
+
+        // prd 9.10 更新报销单, 关联到发票:: todo 宜搭服务注册拿不到系统默认字段, 先查询解决
+        if (data.containsKey("aUuid")) {
+            Thread.sleep(3000);
+            List<Map> process = (List<Map>) ydClient.queryData(YDParam.builder()
+                    .formUuid(data.get("aFormUuid").toString())
+                    .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lmewsobs", data.get("aUuid"))))
+                    .build(), YDConf.FORM_QUERY.retrieve_search_form).getData();
+
+            update.put(data.get("aCompId"),
+                    Arrays.asList(UtilMap.map("appType, formType, instanceId, formUuid, title",
+                            "APP_FKRK7Y94DPI1S9DV1605", "process", process.get(0).get("formInstanceId"), data.get("aFormUuid"), process.get(0).get("title"))));
+            ydParam.setUpdateFormDataJson(JSON.toJSONString(update));
+        }
+        return ydClient.operateData(ydParam, type);
+    }
+
+
+    /**
+     * 子表全部数据获取, 最大分页为50 [可考虑中间表思路]
+     */
+    @Override
+    public List<Map> queryDetails(YDParam ydParam) {
+        return _queryDetails(ydParam, new ArrayList<>());
+    }
+
+    // 递归查询 todo 如果查询中, totalCount 发生变化, 就会进入死循环
+    private List<Map> _queryDetails(YDParam ydParam, List<Map> details) {
+        ydParam.setPageSize(50);
+        DDR_New ddr_new = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_details);
+        details.addAll((List<Map>) ddr_new.getData());
+        if (ddr_new.getTotalCount() != details.size()) {
+            ydParam.setPageNumber(ydParam.getPageNumber() + 1);
+            _queryDetails(ydParam, details);
+        }
+        return details;
+    }
+
+    /**
+     * 查询全部 [主表]
+     */
+    @Override
+    public List<Map> queryAllFormData(YDParam ydParam) {
+        float pageSize = YDConf.PAGE_SIZE_LIMIT;
+        // 查询数据量 [todo 先查询100, 再进行分页, 避免无效查询多一次]; 2. 直接返回formData, 兼容实例ID
+        ydParam.setPageSize(1);
+        long totalCount = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getTotalCount();
+        // 轮询累计数据
+        List<Map> dataList = new ArrayList<>();
+        ydParam.setCurrentPage(1);
+        ydParam.setPageSize((int) pageSize);
+        for (int page = 1; page <= Math.ceil(totalCount / pageSize); page++) {
+            ydParam.setCurrentPage(page);
+            dataList.addAll((List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData());
+        }
+        return dataList;
+    }
+
+    // ppExt: 查询100后再进分页, 且转为formData内数据, todo Process待完成
+    @Override
+    public List<Map> queryFormData_all_advance(YDParam ydParam, YDConf.FORM_QUERY type) {
+
+        float pageSize = YDConf.PAGE_SIZE_LIMIT;
+
+        ydParam.setPageNumber(1); // todo 分页
+        ydParam.setPageSize((int) pageSize);
+        DDR_New ddr_new = ydClient.queryData(ydParam, type);
+
+        List<Map> dataList = new ArrayList<>();
+        dataList.addAll((List<Map>) ddr_new.getData());
+
+        long totalCount = ddr_new.getTotalCount(); // todo 大于1扣减
+        if (totalCount > 100) {
+            for (int page = 2; page <= Math.ceil(totalCount / pageSize); page++) {
+                ydParam.setPageNumber(page);
+                dataList.addAll((List<Map>) ydClient.queryData(ydParam, type).getData());
+            }
+        }
+        return dataList.stream().map(item -> {
+            Map formData = (Map) item.get("formData");
+            formData.put("instanceId", item.get("formInstanceId"));
+            formData.put("formInstanceId", item.get("formInstanceId"));
+            return formData;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Map> queryFormData_all(YDParam YDParam) {
+        List<Map> dataList = queryAllFormData(YDParam);
+        return dataList.stream().map(item -> {
+            Map formData = (Map) item.get("formData");
+            formData.put("instanceId", item.get("formInstanceId"));
+            formData.put("formInstanceId", item.get("formInstanceId"));
+            return formData;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 查询宜搭数据
+     */
+    @Override
+    public List queryDataList_FormData(String formUuid, Map conditions) {
+        conditions = UtilMap.empty(conditions);
+        List<Map> dataList = (List<Map>) ydClient.queryData(YDParam.builder()
+                        .formUuid(formUuid)
+                        .searchFieldJson(JSON.toJSONString(conditions)).build(),
+                YDConf.FORM_QUERY.retrieve_search_form).getData();
+        return dataList.stream().map(item -> {
+            Map formData = (Map) item.get("formData");
+            formData.put("instanceId", item.get("formInstanceId"));
+            return formData;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 查询宜搭数据 [精确匹配]
+     */
+    @Override
+    public List queryFormData(String formUuid, String conditions) {
+        List<Map> dataList = (List<Map>) ydClient.queryData(YDParam.builder()
+                        .formUuid(formUuid)
+                        .searchCondition(conditions).build(),
+                YDConf.FORM_QUERY.retrieve_list).getData();
+        return dataList.stream().map(item -> {
+            Map formData = (Map) item.get("formData");
+            formData.put("instanceId", item.get("formInstanceId"));
+            return formData;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 字段复制
+     */
+    @Override
+    public Object copyFormData(Map data) {
+
+        McException.assertParamException_Null(data, "formData, formUuid, processCode, compIds");
+        Map compIds = (Map) JSON.parse(String.valueOf(data.get("compIds")));
+        McException.assertParamException_Null(compIds, "cur, src"); // compIds 包含全部组件
+        Map formData = (Map) JSON.parse(String.valueOf(data.get("formData")));
+
+        String[] compIds_cur = UtilMap.getString(compIds, "cur").split(", ");
+        String[] compIds_src = UtilMap.getString(compIds, "src").split(", ");
+        McException.assertAccessException(compIds_cur.length != compIds_src.length, "主表的字段数量不一致, 请检查配置");
+
+        // 目标表数据处理
+        Map dataForm = new HashedMap();
+        for (int i = 0; i < compIds_cur.length; i++) {
+            String compId_cur = compIds_cur[i];
+            String compId_src = compIds_src[i];
+            // 子表的顺序要保持一致
+            if (compId_cur.contains("tableField_") || compId_src.contains("tableField_")) {
+                boolean isAssert = (compId_cur.contains("tableField_") && !compId_src.contains("tableField_")) || (!compId_cur.contains("tableField_") && compId_src.contains("tableField_"));
+                McException.assertAccessException(isAssert, "子表组件类型不一致, 请检查配置");
+                String[] compIds_cur_detail = UtilMap.getString(compIds, compId_cur + "_cur").split(", ");
+                String[] compIds_src_detail = UtilMap.getString(compIds, compId_src + "_src").split(", ");
+                McException.assertAccessException(compIds_cur_detail.length != compIds_src_detail.length, "子表的字段数量不一致, 请检查配置");
+                // 子表数据处理
+                List<Map> details = new ArrayList<>();
+                for (Map detail : (List<Map>) UtilMap.getList(formData, compId_cur)) {
+                    Map rowData = new HashedMap();
+                    // 子表组件处理
+                    for (int j = 0; j < compIds_cur_detail.length; j++) {
+                        String compId_cur_detail = compIds_cur_detail[j];
+                        String compId_src_detail = compIds_src_detail[j];
+                        rowData.put(compId_src_detail, YDConf.getDataByCompId(detail, compId_cur_detail));
+                    }
+                    details.add(rowData);
+                }
+                dataForm.put(compId_cur, details);
+            } else {
+                // 主表数据处理
+                dataForm.put(compId_src, YDConf.getDataByCompId(formData, compId_cur));
+            }
+        }
+        // 发起流程/创建表单
+        YDConf.FORM_OPERATION type = data.containsKey("processCode") ? YDConf.FORM_OPERATION.start : YDConf.FORM_OPERATION.create;
+        return ydClient.operateData(YDParam.builder()
+                .formUuid(UtilMap.getString(data, "formUuid"))
+                .processCode(UtilMap.getString(data, "processCode"))
+                .formDataJson(JSON.toJSONString(dataForm))
+                .build(), type);
+    }
+
+    /**
+     * 全表复制 [两张表组件完全一致]
+     */
+    @Override
+    public Object mirrorFormData(String instanceId, String formUuid, String processCode, Map updateData, String updateInstanceId) {
+
+        YDConf.FORM_OPERATION type = StringUtils.isNotBlank(processCode) ? YDConf.FORM_OPERATION.start : YDConf.FORM_OPERATION.create;
+        Map<String, ?> formData = ydClient.queryData(YDParam.builder()
+                        .formInstanceId(instanceId)
+                        .build(),
+                YDConf.FORM_QUERY.retrieve_id).getFormData();
+
+        Map dataForm = UtilMap.empty();
+        for (String compId : formData.keySet()) {
+            // ppExt: 组件会返回带有_id/_value字段, 关联表单 & 成员组件赋值为原字段 [关联表单仅仅会返回带Id字段, 成员组件不带Id返回姓名过滤]
+            if (compId.endsWith("_value") || (compId.startsWith("employeeField_") && !compId.endsWith("_id"))) {
+                continue;
+            }
+            if (compId.endsWith("_id")) {
+                if (compId.startsWith("employeeField_") || compId.startsWith("associationFormField_")) {
+                    compId = compId.replace("_id", "");
+                } else {
+                    continue;
+                }
+            }
+            dataForm.put(compId, YDConf.getDataByCompId(formData, compId));
+            if (compId.startsWith("tableField_")) {
+
+                List<Map<String, ?>> details = (List<Map<String, ?>>) formData.get(compId);
+                List<Map> table = new ArrayList<>();
+                for (Map detail : details) {
+                    Map row = UtilMap.empty();
+                    for (String subId : details.get(0).keySet()) {
+                        // ppExt: 组件会返回带有_id/_value字段, 关联表单 & 成员组件赋值为原字段 [关联表单仅仅会返回带Id字段, 成员组件不带Id返回姓名过滤]
+                        if (subId.endsWith("_value") || (subId.startsWith("employeeField_") && !subId.endsWith("_id"))) {
+                            continue;
+                        }
+                        if (subId.endsWith("_id")) {
+                            if (subId.startsWith("employeeField_") || subId.startsWith("associationFormField_")) {
+                                subId = subId.replace("_id", "");
+                            } else {
+                                continue;
+                            }
+                        }
+                        row.put(subId, YDConf.getDataByCompId(detail, subId));
+                    }
+                    table.add(row);
+                }
+                dataForm.put(compId, table);
+            }
+        }
+        UtilMap.putAll(dataForm, updateData);
+        if (UtilString.isBlankCompatNull(updateInstanceId)) {
+            return ydClient.operateData(YDParam.builder()
+                    .formUuid(formUuid)
+                    .processCode(processCode)
+                    .userId(String.valueOf(UtilMap.getList(formData, "employeeField_l843wfsm_id").get(0)))
+                    .formDataJson(JSON.toJSONString(dataForm))
+                    .build(), type);
+        }
+        return ydClient.operateData(YDParam.builder()
+                .formInstanceId(updateInstanceId)
+                .updateFormDataJson(JSON.toJSONString(dataForm))
+                .build(), YDConf.FORM_OPERATION.update);
+    }
+
+    /**
+     * upsert方法
+     */
+    @Override
+    public Object upsertFormData(String formUuid, Map condition, Map formData, UpsertLambda lambda) {
+        YDParam ydParam = YDParam.builder()
+                .formUuid(formUuid)
+                .searchFieldJson(JSON.toJSONString(condition))
+                .build();
+        // 查询数据, 是否存在
+        List<Map> dataList = (List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
+        McException.assertAccessException(dataList.size() > 1, "upsert方法, 查询条件返回数据不唯一");
+        // 异步回调, 查询结果
+        if (ObjectUtil.isNotNull(lambda)) {
+            Map form = lambda.dataList(dataList);
+            // 若返回为空, 不执行
+            if (ObjectUtil.isNull(form)) {
+                return null;
+            }
+            // 回调数据, 写入表单
+            formData.putAll(form);
+        }
+        if (dataList.size() > 0) {
+            ydParam.setUpdateFormDataJson(JSON.toJSONString(formData));
+            ydParam.setFormInstanceId(dataList.get(0).get("formInstanceId").toString());
+            return ydClient.operateData(ydParam, YDConf.FORM_OPERATION.update);
+        }
+        formData.putAll(condition); // 新增写入查询条件数据
+        ydParam.setFormDataJson(JSON.toJSONString(formData));
+        return ydClient.operateData(ydParam, YDConf.FORM_OPERATION.create);
+    }
+}

+ 33 - 0
mjava/src/main/java/com/malk/service/aliyun/ALYInvoice.java

@@ -0,0 +1,33 @@
+package com.malk.service.aliyun;
+
+import java.util.Map;
+
+public interface ALYInvoice {
+
+
+    /// docs: https://market.aliyun.com/products/56928005/cmapi025075.html?spm=5176.730005.result.20.7c113cc6JseHJH&innerSource=search#sku=yuncode1907500007
+
+    /**
+     * 阿里发票验真: PDF
+     */
+    Map<String, ?> invoiceCheckPDF(String appcode, String pdfUrl);
+
+    /**
+     * 阿里发票验真: 参数
+     */
+    Map<String, ?> invoiceCheckCode(String appcode, String fpdm, String fphm, String kprq, String noTaxAmount, String checkCode);
+
+    /**
+     * 阿里发票验真: 二维码
+     */
+    Map<String, ?> invoiceCheckCode(String appcode, String code);
+
+    
+    /// 文档: https://market.aliyun.com/products/56928005/cmapi034309.html#sku=yuncode2830900002
+
+    /**
+     * 阿里发票验真: image
+     */
+    Map<String, ?> invoiceCheckOCR(String appcode, String imgUrl);
+
+}

+ 87 - 0
mjava/src/main/java/com/malk/service/aliyun/impl/ALYInvoiceImpl.java

@@ -0,0 +1,87 @@
+package com.malk.service.aliyun.impl;
+
+import com.alibaba.fastjson.JSONException;
+import com.malk.server.aliyun.ALYR;
+import com.malk.server.common.McException;
+import com.malk.service.aliyun.ALYInvoice;
+import com.malk.utils.UtilHttp;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class ALYInvoiceImpl implements ALYInvoice {
+
+    // 初始化参数: 加载appcode
+    private Map<String, String> initHeaderAppCode(String appcode) {
+        Map headers = new HashMap();
+        headers.put("Authorization", "APPCODE " + appcode);
+        headers.put("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+        return headers;
+    }
+
+    // 接口异常, 请检查阿里云发票次数余额
+    private Map<String, ?> doPostForResource(String url, String appcode, Map param, Map body, Map form) {
+        ALYR r = null;
+        // 可用余额不足时, 返回403, JSON解析异常
+        try {
+            r = (ALYR) UtilHttp.doPost(url, initHeaderAppCode(appcode), param, body, form, ALYR.class);
+        } catch (JSONException e) {
+            log.info("接口异常, {}", e);
+            McException.exceptionAccess("接口异常, 请检查阿里云发票次数余额");
+        }
+        return (Map<String, ?>) r.getData();
+    }
+
+    /**
+     * 阿里发票验真: PDF文件
+     */
+    @Override
+    public Map<String, ?> invoiceCheckPDF(String appcode, String pdfUrl) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("pdfUrl", pdfUrl);
+        return doPostForResource("https://fapiao.market.alicloudapi.com/v2/invoice/pdf", appcode, param, null, null);
+    }
+
+    /**
+     * 阿里发票验真: 发票查验 [参数]
+     */
+    @Override
+    public Map<String, ?> invoiceCheckCode(String appcode, String fpdm, String fphm, String kprq, String noTaxAmount, String checkCode) {
+        Map<String, String> bodys = new HashMap<>();
+        bodys.put("fpdm", fpdm);
+        bodys.put("fphm", fphm);
+        bodys.put("kprq", kprq);
+        bodys.put("noTaxAmount", noTaxAmount);
+        if (StringUtils.isNotBlank(checkCode) && checkCode.length() > 6) {
+            checkCode = checkCode.substring(checkCode.length() - 6);
+        }
+        bodys.put("checkCode", checkCode);
+        return doPostForResource("https://fapiao.market.alicloudapi.com/v2/invoice/query", appcode, null, null, bodys);
+    }
+
+    /**
+     * 阿里发票验真: 二维码发票查验
+     */
+    @Override
+    public Map<String, ?> invoiceCheckCode(String appcode, String code) {
+        Map<String, String> bodys = new HashMap<>();
+        bodys.put("code", code);
+        return doPostForResource("https://fapiao.market.alicloudapi.com/v2/invoice/qrcode", appcode, null, bodys, null);
+    }
+
+    /**
+     * 阿里发票验真: image
+     */
+    @Override
+    public Map<String, ?> invoiceCheckOCR(String appcode, String imgUrl) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("url", imgUrl);
+//        param.put("extType", true);
+        return doPostForResource("https://invoice.market.alicloudapi.com/v2/invoice/ocr", appcode, null, null, param);
+    }
+}

+ 34 - 0
mjava/src/main/java/com/malk/service/dingtalk/DDClient.java

@@ -0,0 +1,34 @@
+package com.malk.service.dingtalk;
+
+import java.util.Map;
+
+public interface DDClient {
+
+    /**
+     * 获取访问授权
+     */
+    String getAccessToken();
+
+    String getAccessToken(String appKey, String appSecret);
+
+    /**
+     * token授权参数: 旧版本
+     */
+    Map initTokenParams();
+
+    /**
+     * token授权参数: 新版本
+     */
+    Map initTokenHeader();
+
+    /**
+     * 获取js_ticket
+     */
+    String getJsApiTicket(String accessToken);
+
+    /**
+     * 通过免登码获取用户信息
+     */
+    Map getUserInfoByCode(String accessToken, String code);
+}
+

+ 98 - 0
mjava/src/main/java/com/malk/service/dingtalk/DDClient_Attendance.java

@@ -0,0 +1,98 @@
+package com.malk.service.dingtalk;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DDClient_Attendance {
+
+    /**
+     * 获取打卡结果
+     *
+     * @param userIdList   企业内的员工ID列表,最大值50;
+     * @param workDateFrom 和workDateTo参数相隔最多7天(包含7天); 格式为“yyyy-MM-dd HH:mm:ss”,HH:mm:ss可以使用00:00:00,将返回此日期从0点到24点的结果
+     * @param offset       表示获取考勤数据的起始点, 下次获取传的offset值为之前的offset+limit; 表示获取考勤数据的条数,最大值50。
+     */
+    List<Map> listAttendanceResult(String access_token, String[] userIdList, String workDateFrom, String workDateTo, Number offset, Number size);
+
+    /**
+     * 获取打卡详情
+     *
+     * @apiNote https://open.dingtalk.com/document/orgapp/attendance-clock-in-record-is-open
+     */
+    List<Map> listAttendanceRecord(String access_token, List userIds, String checkDateFrom, String checkDateTo);
+
+    /**
+     * 上传打卡记录 [Notice]
+     * -
+     * 1. 接口已下架, 需要开通专业版联系官方开权限
+     * 2. 不是userId, 也可请求成功, 但无数据写入
+     * 3. 考勤会以接口写入为准, 如已存在18点打卡, 再写入14点记录, 显示早退
+     * 4. 可写入未来日期开启, 查询钉钉考勤记录正常返回 [创建时间为接口调用时间]
+     */
+    boolean uploadAttendanceRecord(String access_token, String userId, String deviceName, String deviceId, String photoUrl, long userCheckTime);
+
+    /**
+     * 查询假期余额 [分页是根据游标控制]
+     *
+     * @param op_userid  当前企业内拥有OA审批应用权限的管理员的userId
+     * @param leave_code 假期类型唯一标识 [查询假期规则列表]
+     * @param userids    待查询的员工ID列表, 半角逗号相隔
+     * @param offset     分页偏移,从0开始的非负整数
+     * @param size       分页偏移,最大50
+     */
+    List<Map> queryVacationQuota(String access_token, String op_userid, String leave_code, String userids, int offset, int size);
+
+    /**
+     * 查询假期余额_全部
+     */
+    List<Map> queryVacationQuota_all(String access_token, String op_userid, String leave_code, String userids, int offset, int size);
+
+    /**
+     * 批量查询人员排班信息 [班次ID,无该字段,表明当天休息]
+     *
+     * @param to_date_time 开始时间和结束时间的间隔不能超过7天; 查询时间限制距今180天内.
+     * @param userids      查询的人员userId列表,一次最多可传50个
+     */
+    List<Map> listScheduleUsers(String access_token, String op_user_id, List<String> userids, long from_date_time, long to_date_time);
+
+    /**
+     * 获取考勤报表列定义 [获取假期相关字段信息,不返回ID。可设置考勤字段规则, 对于接口和钉钉后台考勤统计均生效]
+     */
+    List<Map> getAttColumns(String access_token);
+
+    /**
+     * 查询是否启用智能统计报表
+     */
+    boolean isOpenSmartReport(String access_token);
+
+    /**
+     * 获取考勤报表列值
+     *
+     * @param column_id_list 报表列ID,多值用英文逗号分隔,最大长度20 [获取考勤报表列定义接口]
+     * @param to_date        结束时间,结束时间减去开始时间必须在31天以内 [格式为 yyyy-MM-dd HH:mm:ss]
+     */
+    List<Map> getAttColumnVal(String access_token, String userid, List<String> column_id_list, String from_date, String to_date);
+
+    /**
+     * 获取考勤报表列值
+     *
+     * @param leave_names 报表列ID,假期名称,多个用英文逗号分隔,最大长度20 [获取考勤报表列定义接口, 无Id列]
+     * @param to_date     结束时间,结束时间减去开始时间必须在31天以内 [格式为 yyyy-MM-dd HH:mm:ss]
+     */
+    List<Map> getLeaveTimeByNames(String access_token, String userid, List<String> leave_names, String from_date, String to_date);
+
+    /**
+     * 获取班次详情 [应出勤天数, 仅返回当天]
+     */
+    Map getAttendanceShiftDetail(String access_token, String op_user_id, String shift_id);
+
+    /**
+     * 搜索考勤组详情
+     */
+    Map getAttendanceGroupDetail(String access_token, String op_user_id, String group_id);
+
+    /**
+     * 搜索考勤组摘要
+     */
+    List<Map> getAttendanceGroupSearch(String access_token, String op_user_id, String group_name);
+}

+ 99 - 0
mjava/src/main/java/com/malk/service/dingtalk/DDClient_Contacts.java

@@ -0,0 +1,99 @@
+package com.malk.service.dingtalk;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 钉钉通讯录管理
+ *
+ * @apiNote https://open.dingtalk.com/document/orgapp/contacts-overview
+ */
+public interface DDClient_Contacts {
+
+    /**
+     * 获取子部门ID列表 [获取企业部门下的所有直属子部门列表]
+     */
+    List<Long> listSubDepartmentId(String access_token, long dept_id);
+
+    /**
+     * 获取部门列表
+     */
+    List<Map> listSubDepartmentDetail(String access_token, long dept_id);
+
+    /**
+     * 获取全部架构内部门_全部 ID [是否包含一级部门]
+     */
+    List<Long> getDepartmentId_all(String access_token, boolean containsTop);
+
+    List<Long> getDepartmentId_all(String access_token, boolean containsTop, long deptId);
+
+    /**
+     * 获取全部架构内部门_全部 detail [是否包含一级部门]
+     */
+    List<Map> getDepartmentDetail_all(String access_token, boolean containsTop);
+
+    /**
+     * 获取部门用户userid列表 [无需分页]
+     */
+    List<String> listDepartmentUserId(String access_token, long dept_id);
+
+    /**
+     * 查询用户详情
+     * -
+     * [入职时间 需要再在花名册添加员工可见, 接口才会返回]
+     * [手机号\邮箱等, 只有应用开通通讯录邮箱等个人信息权限,才会返回该字段: 如个人邮箱 fieldEmail]
+     * ppExt: 企业邮箱org_email, 若无则字段不返回; 手机号telephone无值, 但mobile会返回
+     */
+    Map getUserInfoById(String access_token, String userId);
+
+    /**
+     * 根据手机号查询用户 [手机号查询仅返回userid, 查询详情后返回]
+     */
+    Map getUserInfoByMobile(String access_token, String mobile);
+
+    /**
+     * 删除用户
+     */
+    boolean deleteUser(String access_token, String userId);
+
+    /**
+     * 查询离职记录列表
+     *
+     * @param startTime 开始时间: 格式:YYYY-MM-DDTHH:mm:ssZ(ISO 8601/RFC 3339)
+     * @param extInfo   maxResults, 每页最大条目数,最大值50. nextToken 分页游标. endTime 结束时间, 默认当前时间, 查询跨度不能超过365天
+     */
+    List<Map<String, String>> getLeaveEmployeeRecords(String access_token, Date startTime, Map extInfo);
+
+    /**
+     * 获取指定用户的所有父部门列表
+     */
+    Map listParentByUser(String access_token, String userId);
+
+    /**
+     * 创建用户 [24小时只能收到一次邀请通知, 若是频繁退出再进入, 可关闭邀请确认后自动加入, 路径: 设置 - 安全中心 - 隐私开关 - 团队添加我时需要我的确认 - 关闭]
+     */
+    Map createUser(String access_token, String name, String mobile, List<String> dept_id_list, Map body_ext);
+
+    /**
+     * 创建钉钉自建企业账号 [邮箱为必填]
+     */
+    Map createUser_dingTalk(String access_token, String login_id, String init_password, String name, List<Long> dept_id_list, Map body_ext);
+
+    /**
+     * 创建部门
+     */
+    Map createDepartment(String access_token, String name, long parent_id, Map body_ext);
+
+    /**
+     * 获取部门详情
+     */
+    Map getDepartmentInfo(String access_token, long dept_id);
+
+    /**
+     * 获取员工人数
+     *
+     * @param only_active 是否包含未激活钉钉人数
+     */
+    int getUserCount(String access_token, boolean only_active);
+}

+ 29 - 0
mjava/src/main/java/com/malk/service/dingtalk/DDClient_Dedicated.java

@@ -0,0 +1,29 @@
+package com.malk.service.dingtalk;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
+
+public interface DDClient_Dedicated {
+
+    /**
+     * 获取文件操作记录
+     *
+     * @param startDate     操作日志起始时间,UNIX时间戳,单位毫秒。
+     * @param endDate       操作日志截止时间,UNIX时间戳,单位毫秒。
+     * @param pageSize      每页最大条目数,最大值500。
+     * @param preLastRecord nextGmtCreate/nextBizId,作为分页偏移量。[如果是非首次调用,该参数传上次调用时返回的最后一条记录的值。]
+     */
+    List<Map> obtainFileOperationRecords(String accessToken, @NotNull long startDate, @NotNull long endDate, @NotNull int pageSize, Map preLastRecord);
+
+    /**
+     * 启用企业帐号
+     **/
+
+    boolean orgAccountsEnable(String accessToken, String userId);
+
+    /**
+     * 停用企业帐号
+     */
+    boolean orgAccountsDisable(String accessToken, String userId);
+}

+ 39 - 0
mjava/src/main/java/com/malk/service/dingtalk/DDClient_Event.java

@@ -0,0 +1,39 @@
+package com.malk.service.dingtalk;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DDClient_Event {
+
+    /**
+     * 钉钉审批回调事件
+     * -
+     * 审批任务可以获取到, 审批意见 [监听转交]; 审批回调可以监听到发起人撤销
+     */
+    void callBackEvent_Workflow(JSONObject eventJson);
+
+    /**
+     * 同步推送失败记录定时处理 [推送失败钉钉记录, 获取后记录会被清空]
+     * -
+     * 定时任务进行调用: 同步后自动执行 callBackEvent_Workflow 方法实现
+     * 回调数据字段名称: bpmsCallBackData:审批回调, roleLabelChange:角色回调, callbackData:其他回调
+     */
+    void syncFailedList(String access_token);
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * 获取推送失败列表
+     * -
+     * 推送失败钉钉记录, 获取后记录会被清空
+     */
+    List<Map> getFailedList(String access_token);
+
+    /**
+     * 获取推送失败列表_全部
+     */
+    List getFailedList_all(String access_token);
+
+}

+ 0 - 0
mjava/src/main/java/com/malk/service/dingtalk/DDClient_Extension.java


Some files were not shown because too many files changed in this diff