思库运行问题调整

mjava-siku/src/main/java/com/malk/siku/controller/SikuController.java

@@ -8,12 +8,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.http.ContentDisposition;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -125,7 +127,7 @@ public class SikuController {
         return McR.success();
     }
 
-    //每刻报销报销单完成回调
+    //每刻报销报销单完成回调 --每刻项目支付单（对公）
     @PostMapping("/reimbursement/callback")
     public McR callback3(@RequestBody Map map){
         log.info("每刻报销报销单完成回调：{}", JSONObject.toJSONString(map));
@@ -135,7 +137,7 @@ public class SikuController {
         return McR.success();
     }
 
-    //每刻报销付款单完成回调
+    //每刻报销付款单完成回调 --每刻分期付款单（对公）
     @PostMapping("/pay/callback")
     public McR callback4(@RequestBody Map map){
         log.info("每刻报销付款单完成回调：{}", JSONObject.toJSONString(map));
@@ -145,7 +147,7 @@ public class SikuController {
         return McR.success();
     }
 
-    //每刻报销预付退回完成回调
+    //每刻报销预付退回完成回调--支付退回单
     @PostMapping("/repay/callback")
     public McR callback5(@RequestBody Map map){
         log.info("每刻报销预付退回完成回调：{}", JSONObject.toJSONString(map));
@@ -175,7 +177,9 @@ public class SikuController {
         return McR.success();
     }
 
-    //每刻报销费用报销单完成回调（项目报销单（个人）、项目差旅报销单、打车（企业支付）（"是否有项目"为【是】））
+
+
+    //每刻报销费用报销单完成回调（项目报销单（个人）、项目差旅报销单、打车（企业支付）（"是否有项目"为【是】）、商旅月结）
     @PostMapping("/reimbursement2/callback")
         public McR callback8(@RequestBody Map map){
         log.info("每刻报销费用报销单完成回调：{}", JSONObject.toJSONString(map));
@@ -199,6 +203,19 @@ public class SikuController {
         return sikuService.ddProject(map);
     }
 
+//    宜搭项目同步每刻
+    @PostMapping("/saveProjecData")
+    public McR saveProjectReferenceData(@RequestBody Map map){
+        return sikuService.saveProjecData(map);
+    }
+
+//    计算供应商主数据平均分
+    @PostMapping("/caculateScore")
+    public McR caculateScore(@RequestBody Map map){
+        return sikuService.caculateScore(map);
+    }
+
+
     @GetMapping("/files/{fileId}")
     public ResponseEntity<Resource> getFileResource(
             @PathVariable String fileId,

mjava-siku/src/main/java/com/malk/siku/schedule/SikuTask.java

@@ -27,4 +27,10 @@ public class SikuTask {
         sikuTaskService.syncLoanManage();
     }
 
+
+
+
+
+
+
 }

mjava-siku/src/main/java/com/malk/siku/service/SikuService.java

@@ -40,4 +40,8 @@ public interface SikuService {
     void invoiceWriteBack9(Map map);
 
     McR ddProject(Map map);
+
+    McR saveProjecData (Map map);
+
+    McR caculateScore(Map map);
 }

mjava-siku/src/main/java/com/malk/siku/service/SikuTaskService.java

@@ -1,6 +1,10 @@
 package com.malk.siku.service;
 
+import com.malk.server.common.McR;
+
 public interface SikuTaskService {
     void syncLoanManage();
 
+
+
 }

mjava-siku/src/main/java/com/malk/siku/service/impl/SikuTaskServiceImpl.java

@@ -125,6 +125,8 @@ public class SikuTaskServiceImpl implements SikuTaskService {
     }
 
 
+
+
     //自带重试的operateData方法
     private Object retryOperateData(YDParam param, YDConf.FORM_OPERATION formOperation) {
         int maxAttempts = 3; // 尝试的最大次数

mjava-siku/src/main/java/com/malk/siku/utils/MkBxUtil.java

@@ -309,6 +309,25 @@ public class MkBxUtil {
         return totalList;
     }
 
+//    批量新增或更新每刻自定义档案选项
+    public static Map saveReferenceDataDetail(Object body) {
+        log.info("保存每刻自定义档案选项，body:{}", JSONObject.toJSONString(body));
+
+        Map result = (Map) JSONObject.parse(
+                UtilHttp.doPost(
+                        "https://" + host + "/api/openapi/reference/data/detail",
+                        MkBxUtil.initTokenHeader(),
+                        null,
+                        body,
+                        (Map) null
+                )
+        );
+
+        log.info("保存每刻自定义档案选项结果:{}", result);
+        return result;
+    }
+
+
     private static String getSecret(String appCode, String appSecret, long timeMillis){
         log.info("time：{}",timeMillis);
 

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

@@ -1,5 +1,5 @@
 server:
-  port: 9037
+  port: 9002
   servlet:
     context-path: /api/siku
 
@@ -27,5 +27,5 @@ aliwork:
 
 mk:
   downloadFilePath: d:\\
-  downloadUrl: http://localhost:9037/api/siku/
+  downloadUrl: http://localhost:9002/api/siku/
 

mjava-siku/src/test/java/com.malk.siku/SkTest.java

@@ -221,6 +221,44 @@ public class SkTest {
         System.out.println("timestamp:"+currentTimeMillis);
     }
 
+    @Test
+    public void saveYpClient() throws ParseException {
+//       sikuService.saveYpClient(UtilMap.map("formInstId", "8281f53e-f767-4020-8ff8-662d3578bcda"));
+
+    }
+    @Test
+    public void saveYpApplication() throws ParseException {
+//        sikuService.saveYpApplication(UtilMap.map("formInstId", "8281f53e-f767-4020-8ff8-662d3578bcda"));
+
+    }
+    @Test
+    public void ddProject() throws ParseException {
+//        sikuService.ddProject(UtilMap.map("formInstId, type", "67af1b43-13b1-4f65-8a74-239e738403ae, update"));
+
+    }
+
+    @Test
+    public void saveBxReimbursement2() throws ParseException {
+//        sikuService.saveBxReimbursement2(UtilMap.map("formInstId", "0127d609-af95-492e-b111-cafa3f0de0e5"));
+
+    }
+
+    @Test
+    public void caculateScore(){
+        sikuService.caculateScore(UtilMap.map("formInstId", "FINST-OO866VA1I2552CLBP2KBX4R0SFSZ203Y4GCOMFV2"));
+
+    }
+
+
+    @Test
+    public void syncLoanManage(){
+        sikuTaskService.syncLoanManage();
+
+    }
+
+
+
+