wzy 5 days ago
parent
commit
09c9ff9fc7

+ 6 - 0
mjava-huagao/src/main/java/com/malk/huagao/schedule/KdScheduleTask.java

@@ -48,4 +48,10 @@ public class KdScheduleTask {
     public void syncDLVNotice(){
         kdHuaGaoService.syncDLVNotice(null);
     }
+
+    //每天00:02定时同步采购订单
+    @Scheduled(cron = "0 2 0 * * ?")
+    public void syncPUROrder(){
+        kdHuaGaoService.syncPUROrder();
+    }
 }

+ 1 - 1
mjava-huagao/src/main/java/com/malk/huagao/schedule/ScheduleTask.java

@@ -44,7 +44,7 @@ public class ScheduleTask {
     /**
      *
      */
-//    @Scheduled(cron = "0 5 2 1 * ?")
+    @Scheduled(cron = "0 5 2 1 * ?")
     public void syncMonths() {
         log.info("考勤同步-月度");
         LocalDateTime startTime = LocalDate.now().minusMonths(1).atTime(LocalTime.MIN);

+ 2 - 0
mjava-huagao/src/main/java/com/malk/huagao/service/KdHuaGaoService.java

@@ -12,4 +12,6 @@ public interface KdHuaGaoService {
     void syncPendingProducts();
 
     void syncDLVNotice(String userId);
+
+    void syncPUROrder();
 }

File diff suppressed because it is too large
+ 190 - 0
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java


+ 39 - 1
mjava-huagao/src/main/java/com/malk/huagao/service/impl/McProjectServiceImpl.java

@@ -1,19 +1,31 @@
 package com.malk.huagao.service.impl;
 
 import com.malk.core.McProject;
+import com.malk.huagao.service.HuaGaoService;
 import com.malk.huagao.service.McProjectService;
 import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilDateTime;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Arrays;
+import java.util.List;
+
 @Slf4j
 @Service
 public class McProjectServiceImpl implements McProjectService {
+    @Autowired
+    private Environment environment;
 
     @Autowired
-    private YDClient ydClient;
+    private HuaGaoService huaGaoService;
 
     @Override
     public void init() {
@@ -22,5 +34,31 @@ public class McProjectServiceImpl implements McProjectService {
         McProject.addYida("1002",new String[] {"APP_YONR16SZSUIZCKXJUNSY","TNA66KB1AEDXKQHQ8IJBG53BDW7Q27TM33HDMADI"});//数据分析看板
         McProject.addYida("1003",new String[] {"APP_VQDMMWS6OR1VHL8VMFD3","XE766X81JHKXK4Z27SYOI86CPCLQ3J1LV7ODMH2"});//华高CRM
         log.info("项目加载完毕:1001,1002,1003");
+
+        // 生产环境2专属逻辑
+        if (isProdEnvironment()) {
+            executeProductionMethod();
+        }
+    }
+
+    private boolean isProdEnvironment() {
+        String[] activeProfiles = environment.getActiveProfiles();
+        for (String profile : activeProfiles) {
+            if ("prod2".equals(profile)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    @Profile("prod2")
+    private void executeProductionMethod() {
+        log.info("异常重启考勤同步-周度");
+        LocalDateTime startTime = LocalDate.now().minusWeeks(1).atTime(LocalTime.MIN);
+        LocalDateTime endTime = LocalDate.now().atTime(LocalTime.MIN);
+        try {
+            huaGaoService.syncKqData(startTime, endTime);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 66 - 0
mjava-huagao/src/main/resources/application-prod2.yml

@@ -0,0 +1,66 @@
+#异常重启 生产环境2
+server:
+  port: 7708
+  servlet:
+    context-path: /huagao
+
+enable:
+  scheduling: true
+logging:
+  config: classpath:logback-spring.xml
+  path: /home/server/huagao/log/
+  level:
+    com.malk.*: info
+
+spring:
+  datasource:
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    #trustServerCertificate=true 临时绕过证书验证的风险
+    url: jdbc:sqlserver://113.45.187.194:1433;databaseName=dingding;encrypt=true;trustServerCertificate=true;
+    username: hgdd
+    password: hgdd@2025
+
+mybatis-plus:
+  configuration:
+    #开启驼峰命名自动映射
+    map-underscore-to-camel-case: true
+    #开启日志打印
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  type-aliases-package: com.malk.huagao.entity
+  #扫描mapper文件
+  mapper-locations: classpath:mapper/*.xml
+
+# dingtalk
+dingtalk:
+  agentId: 3254218465
+  appKey: dingdhgwe3g6xrifq3iz
+  appSecret: xO9uBMFGvv79UAqv8HBPZQVXLBbLhf8ueX28Vtn_de-4ME7-K9wBRVFihCGFoeX4
+  corpId:
+  aesKey:
+  token:
+  operator:
+
+# aliwork
+aliwork:
+  appType: APP_BWPT6ET90UEE8IBEY9GJ
+  systemToken: 37766HD145ST2RBB9S4D37J2WMNU293GASC8M6Q
+
+kingdee:
+  # 第三方系统登录授权的账套ID
+  X-KDApi-AcctID: 626cda24137359
+  # 第三方系统登录授权的用户
+  X-KDApi-UserName: dingding
+  # 第三方系统登录授权的应用ID
+  X-KDApi-AppID: 322503_566rSdHtylkb4+XoW1XoRdVGSqW85LOs
+  # 第三方系统登录授权的应用密钥
+  X-KDApi-AppSec: 7eaf6845da0540e6b8f328541b36dff6
+  # 服务Url地址(公有云统一走网关sdk底层已处理,无需传X-KDApi-ServerUrl,下面这行需要注释)
+  X-KDApi-ServerUrl: http://113.45.187.194:81/k3cloud/
+  # 账套语系,默认2052
+  # X-KDApi-LCID: 2052
+  # 组织编码,启用多组织时配置对应的组织编码才有效
+  # X-KDApi-OrgNum: 100
+  # 允许的最大连接延时,单位为秒
+  # X-KDApi-ConnectTimeout: 120
+  # 允许的最大读取延时,单位为秒
+  # X-KDApi-RequestTimeout: 120

+ 5 - 0
mjava-huagao/src/test/java/com/malk/huagao/KdTest.java

@@ -227,6 +227,11 @@ public void test50() throws Exception {
         System.out.println("aaa"+JSONObject.toJSONString(aaa));
     }
 
+    @Test
+    public void test10(){
+        kdHuaGaoService.syncPUROrder();
+    }
+
     private IdentifyInfo initIden(){
         //注意 1:此处不再使用参数形式传入用户名及密码等敏感信息,改为在登录配置文件中设置。
         //注意 2:必须先配置第三方系统登录授权信息后,再进行业务操作,详情参考各语言版本SDK介绍中的登录配置文件说明。

+ 2 - 2
mjava-huagao/src/test/java/com/malk/huagao/YyYdTest.java

@@ -114,8 +114,8 @@ public class YyYdTest {
 
     @Test
     public void test3() {
-        LocalDateTime startTime= LocalDate.now().minusDays(2).atTime(LocalTime.MIN);
-        LocalDateTime endTime= LocalDate.now().minusDays(1).atTime(LocalTime.MIN);
+        LocalDateTime startTime= LocalDate.now().minusDays(6).atTime(LocalTime.MIN);
+        LocalDateTime endTime= LocalDate.now().minusDays(4).atTime(LocalTime.MIN);
 //        LocalDateTime endTime= LocalDate.now().atTime(LocalTime.MIN);
 
         huaGaoService.syncKqData(startTime,endTime);