Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mjava-ruisi/src/main/java/com/malk/ruisi/controller/RsQysController.java
#	mjava-ruisi/src/main/java/com/malk/ruisi/server/YDParam_T.java
#	mjava-ruisi/src/main/java/com/malk/ruisi/service/impl/dingshiqiImpl.java
#	mjava-ruisi/src/main/resources/application-dev.yml

mjava-ruisi/src/main/java/com/malk/ruisi/controller/RsQysController.java

@@ -5,9 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.malk.ruisi.service.RsQysService;
 import com.malk.ruisi.service.dingshiqi;
 import com.malk.server.common.McR;
+import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 @RestController
 @Slf4j
@@ -15,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 public class RsQysController {
     @Autowired
     private RsQysService rsQysService;
+
     /* 契约锁回调密钥 */
 
     /***
@@ -52,8 +58,6 @@ public class RsQysController {
     }
     /***
      * 预签署  可重复获取
-     * @param
-     * @return
      */
     @PostMapping("/appointurl")
     public McR appointurl(String contractId) throws Exception {
@@ -110,8 +114,6 @@ public class RsQysController {
 //    }
     /***
      * 授权物理印章码
-     * @param
-     * @return
      */
     @PostMapping("/apply")
     public McR apply(@RequestBody JSONObject param) throws Exception {
@@ -121,14 +123,25 @@ public class RsQysController {
 
     /***
      * 合同签署页面
-     * @param
-     * @return
      */
     @PostMapping("/signurl")
     public McR signurl(@RequestBody JSONObject param) throws Exception {
         log.info("进入 apply 接口,参数：{}",param);
         return rsQysService.signurl(param);
     }
+
+    @Autowired
+    private dingshiqi timer;
+
+    /**
+     * 同步同步契约锁档案
+     */
+    @GetMapping("sync-qys")
+    public McR syncQys(@RequestParam String type) {
+
+        timer.syncCommon(type);
+        return McR.success();
+    }
     @Autowired
     private dingshiqi timer;
     /**

mjava-ruisi/src/main/java/com/malk/ruisi/server/YDParam_T.java

@@ -2,6 +2,10 @@ package com.malk.ruisi.server;
 
 import com.malk.server.aliwork.YDParam;
 import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 public class YDParam_T extends YDParam {

mjava-ruisi/src/main/java/com/malk/ruisi/service/impl/dingshiqiImpl.java

@@ -14,6 +14,7 @@ import com.malk.ruisi.service.dingshiqi;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
 import com.malk.server.common.McException;
+import com.malk.server.common.McR;
 import com.malk.server.dingtalk.DDR;
 import com.malk.server.dingtalk.DDR_New;
 import com.malk.service.aliwork.YDClient;
@@ -35,6 +36,7 @@ import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.*;
+import java.util.*;
 
 import static com.malk.ruisi.constant.QysConstant.*;
 
@@ -474,4 +476,44 @@ public class dingshiqiImpl implements dingshiqi {
         // 匹配停用数据做更新
         this.syncRecruitSource(type);
     }
+
+
+
+    @Autowired
+    private YDService ydService;
+
+    /**
+     * 停用数据同步逻辑
+     */
+    @Override
+    public void syncRecruitSource(String type) {
+
+        Map mapForm = UtilMap.map("YWFL, YZDZ, YZWL", "FORM-417576F4EE9F4AA1B2395BCD93B7A08C8ASN", "FORM-6D5B2C469B45456F9287C3575BFF92C7KUF6", "FORM-7ACCB70D96FA4187BD2042243641E54CD6VH");
+        String formUuid = UtilMap.getString(mapForm, type);
+        McException.assertParamException(StringUtils.isBlank(formUuid), "同步数据档案不存在!");
+        YDParam_T ydParamT = new YDParam_T();
+        ydParamT.setFormUuid(formUuid);
+        ydParamT.setSearchCondition(JSON.toJSONString(UtilMap.map("radioField_lznyvvav", "启用")));
+        ydParamT.setModifiedToTimeGMT(UtilDateTime.formatDate(new Date(new Date().getTime() - 1 * 24 * 60 * 60 * 1000L)));
+        List<Map> dataList = ydService.queryFormData_all(ydParamT);
+        dataList.forEach(item -> {
+            ydClient.operateData(YDParam.builder()
+                    .formInstanceId(UtilMap.getString(item, "instanceId"))
+                    .updateFormDataJson(JSON.toJSONString(UtilMap.map("radioField_lznyvvav", "停用")))
+                    .build(), YDConf.FORM_OPERATION.update);
+        });
+    }
+
+    /**
+     * 同步数据公共方法, 手动 + 定时
+     */
+    @Override
+    public void syncCommon(String type) {
+
+        // todo 罗:: 判定不同来源, 这里触发原有逻辑同步, 添加同步时间和状态写入
+
+
+        // 匹配停用数据做更新
+        this.syncRecruitSource(type);
+    }
 }

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

@@ -9,6 +9,7 @@ logging:
   config: classpath:logback-spring.xml
   path: ./log
   level:
+    org.springframework: warn
     com.malk.*: debug
 
 # dingtalk