소스 검색

衫泰项目

lfx 1 년 전
부모
커밋
42e3d1df9e

+ 28 - 0
mjava-kuaikeli/src/main/java/com/malk/kuaikeli/schedule/TestTask.java

@@ -0,0 +1,28 @@
+package com.malk.kuaikeli.schedule;
+
+import com.malk.service.dingtalk.DDClient;
+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;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Configuration
+@EnableScheduling
+@ConditionalOnProperty(name = {"enable.scheduling"})
+public class TestTask {
+
+    @Autowired
+    private DDClient ddClient;
+
+    @Scheduled(cron = "0/5 * * * * ?")
+    public void sync(){
+//        String accessToken = ddClient.getAccessToken();
+        System.out.println(LocalDateTime.now());
+    }
+
+}

+ 3 - 3
mjava-kuaikeli/src/main/java/com/malk/kuaikeli/service/impl/KKLImplService.java

@@ -112,7 +112,7 @@ public class KKLImplService implements KKLService {
      */
     @Override
     @SneakyThrows
-    @Synchronized
+//    @Synchronized
     public void serviceRate(Map data) {
 
         // todo: 宜搭更新,校验的超时等待在3s, 因此方法修改为异步. 容错定时任务?匹配不一致数据
@@ -163,7 +163,7 @@ public class KKLImplService implements KKLService {
     List<Map> supperMaterials(String code, String type) {
         List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
                 .formUuid("FORM-12EB6BCE3C264630824721E7BBABCC03L8U9")
-                .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_llzzbyj1, selectField_llkb7kd5", code, type)))
+                .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_llzzbyj1, selectField_llkk6cms", code, type)))
                 .build());
         log.info("supperMaterials, {}", dataList.size());
         return dataList;
@@ -173,7 +173,7 @@ public class KKLImplService implements KKLService {
     List<Map> projectMaterials(String code, String type) {
         List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
                 .formUuid("FORM-E6766M811CKD2PIXEAKOM9S2DKBM2PBQU1MLL5")
-                .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_llzzbyj1, selectField_llkb7kd5", code, type)))
+                .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_llzzbyj1, selectField_llkk6cms", code, type)))
                 .build());
         log.info("projectMaterials, {}", dataList.size());
         return dataList;

+ 31 - 6
mjava-kuaikeli/src/test/java/com/malk/kuaikeli/DdTest.java

@@ -1,10 +1,13 @@
 package com.malk.kuaikeli;
 
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.malk.kuaikeli.service.KKLService;
 import com.malk.kuaikeli.service.SupplierMaterialService;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
 import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,6 +26,8 @@ public class DdTest {
     private SupplierMaterialService supplierMaterialService;
     @Autowired
     private YDClient ydClient;
+    @Autowired
+    private KKLService kklService;
 
     @Test
     public void create(){
@@ -32,12 +37,32 @@ public class DdTest {
 
     @Test
     public void test(){
-        Map form = ydClient.queryData(YDParam.builder()
-                .appType("APP_K8EYBJO1GLUWYIXT12DI")
-                .systemToken("7C766871QS1GIKQ68SWX0BS71RSZ1LONSB2PLA")
-                .formInstanceId(String.valueOf("0b8d83d3-65e8-47ce-94f0-5ac326ec7992"))
-                .build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
-        System.out.println(JSONObject.toJSONString(form));
+//        Map form = ydClient.queryData(YDParam.builder()
+//                .appType("APP_K8EYBJO1GLUWYIXT12DI")
+//                .systemToken("7C766871QS1GIKQ68SWX0BS71RSZ1LONSB2PLA")
+//                .formInstanceId(String.valueOf("0b8d83d3-65e8-47ce-94f0-5ac326ec7992"))
+//                .build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
+//        System.out.println(JSONObject.toJSONString(form));
+        ydClient.operateData(YDParam.builder()
+                        .appType("APP_YSEVMCWNRJAKT4X1HRWZ")
+                .systemToken("TL7661A1OXSJJ5EI6EPT36859MJT383P9MGUL25")
+                .formUuid("FORM-430FF05A3B89497D9AFE0D89660E1E34HKQ5")
+                .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_lvm4l2i7","1001")))
+                .formDataJson(JSONObject.toJSONString(UtilMap.map("textField_lvm4l2i7, textField_lvm4l2i8, textField_lvm4o3p9","1001","张三", RandomUtil.randomString(10))))
+                .build(), YDConf.FORM_OPERATION.upsert);
     }
 
+    String aa="{\"code\":\"GYS-20240429-014\",\"proCode\":\"XM-20240429-015\",\"rate\":\"[\\\"10\\\",\\\"10\\\",\\\"10\\\",\\\"10\\\"]\",\"rate2\":\"[\\\"10\\\",\\\"10\\\",\\\"10\\\",\\\"10\\\"]\",\"proName\":\"测试项目案例\",\"type\":\"[\\\"猪肉类\\\",\\\"冷冻肉类制品\\\",\\\"叶菜类\\\",\\\"水果\\\"]\",\"status\":\"[\\\"已启用\\\",\\\"已启用\\\",\\\"已启用\\\",\\\"已启用\\\"]\"}";
+
+    @Test
+    public void tt(){
+        Map data=JSONObject.parseObject(aa);
+        kklService.serviceRate(data);
+
+        try {
+            Thread.sleep(1000*100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
 }

+ 0 - 16
mjava-santai/src/main/java/com/malk/santai/config/StEkbConfig.java

@@ -1,16 +0,0 @@
-package com.malk.santai.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "ekb")
-@Data
-public class StEkbConfig {
-
-    private String preUrl;
-    private String appKey;
-    private String appSecurity;
-
-}