合同号/立项号检查

docker-compose-server.yml

@@ -12,12 +12,12 @@
 # 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-server.yml up
 version: '2'
 services:
-  oasystem-mysql:
+  formaloasystem-mysql:
     image: 1ar8696937.iok.la:22594/oasystem-mysql:latest
     environment:
       MYSQL_ROOT_PASSWORD: gf^*i6%&9J83&(*kJ653F&L
     restart: always
-    container_name: oasystem-mysql
+    container_name: formaloasystem-mysql
     command:
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_general_ci
@@ -25,22 +25,22 @@ services:
       --lower_case_table_names=1
       --max_allowed_packet=128M
     ports:
-      - 24680:3306
+      - 13579:3306
 
-  oasystem-redis:
+  formaloasystem-redis:
     image: redis:5.0
     ports:
-      - 6666:6379
+      - 6379:6379
     restart: always
-    container_name: oasystem-redis
+    container_name: formaloasystem-redis
 
-  oasystem-system:
+  formaloasystem-system:
     image: 1ar8696937.iok.la:22594/oasystem-system:latest
     restart: always
-    container_name: oasystem-system
+    container_name: formaloasystem-system
     volumes:
-      - /data/config:/oasystem/config
+      - /data/config:/formaloasystem/config
     ports:
-      - 8081:8081
+      - 8090:8081
 
  
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/Util/OAUtil.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.iost.API.Util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.Feature;
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import org.jeecg.modules.iost.API.webapi.SALorderWebapi;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
 
@@ -25,17 +28,40 @@ public class OAUtil {
         return apiUrl;
     }
 
-    static public String filter(String s) {//过滤掉不包含F_QPOV_Base字段的数据，并返回展示
+
+
+    static public String filter(String s,SALorderWebapi webapi) {//过滤掉不包含F_QPOV_Base字段的数据，并返回展示
 //        那个默认值的代码是：XXDD202105200009，名称是：QJFYQC001
         Map QJFYQC001 = new HashMap<>();
-        QJFYQC001.put("FName","QJFYQC001");
+        QJFYQC001.put("FName", "QJFYQC001");
         List list = JSON.parseObject(s, List.class, Feature.OrderedField);
         List<Map> returnResults = new ArrayList<Map>();
+        Map<String,K3CloudApiClient> clientMap = new HashMap() {{
+            put("clientTwo", null);
+        }};
         for (Object linkedHashMap : list) {
             Map map = JSON.parseObject(linkedHashMap.toString(), LinkedHashMap.class);
             if (map.containsKey("F_QPOV_Base")) {
                 if (null != map.get("F_QPOV_Base")) {
-                    returnResults.add(map);
+                    Map F_QPOV_Base = JSON.parseObject(map.get("F_QPOV_Base").toString(), LinkedHashMap.class);
+
+                    String fName = F_QPOV_Base.get("FName").toString();
+
+                    List isFnumber = webapi.checkFiled("fnumber","fnume", fName, clientMap);
+                    if (null==isFnumber) {
+                        List isFname = webapi.checkFiled("fname","fnume", fName, clientMap);
+                        if (null==isFname) {
+                            map.put("F_QPOV_Base", QJFYQC001);
+                            returnResults.add(map);
+                        }else {
+                            returnResults.add(map);
+                        }
+                    }else {
+                        map.put("F_QPOV_Base", isFnumber.get(0));
+                        returnResults.add(map);
+                    }
+
+
                 } else {
                     map.put("F_QPOV_Base", QJFYQC001);
                     returnResults.add(map);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryBusinessTripDetailsServiceImpl.java

@@ -91,7 +91,7 @@ public class QueryBusinessTripDetailsServiceImpl extends ServiceImpl<QueryBusine
 
 
         try {
-            add = businessTripInterfaceWebapi.batchAdd(OAUtil.filter(s));
+            add = businessTripInterfaceWebapi.batchAdd(OAUtil.filter(s,salwebapi));
         } catch (Exception e) {
             webApiCatch = false;
             e.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryLoanDetailsServiceImpl.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.iost.API.service.IQueryLoanDetailsService;
 import org.jeecg.modules.iost.API.service.kingdeejournal.IKingdeeSaveJournalService;
 import org.jeecg.modules.iost.API.service.oajournal.IOaSelectJournalService;
 import org.jeecg.modules.iost.API.webapi.LoanInterfaceWebapi;
+import org.jeecg.modules.iost.API.webapi.SALorderWebapi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,8 @@ public class QueryLoanDetailsServiceImpl extends ServiceImpl<QueryLoanDetailsMap
     private IOaSelectJournalService oaSelectJournalService;
     @Autowired
     private IKingdeeSaveJournalService KingdeeSaveJournalService;
+    @Autowired
+    private SALorderWebapi salwebapi;
     private int BusinessNo = 1;
 
     @Override
@@ -82,7 +85,7 @@ public class QueryLoanDetailsServiceImpl extends ServiceImpl<QueryLoanDetailsMap
         Object result = jsonObject.get("result");
         String s = result.toString();
         try {
-            add = loanInterfaceWebapi.batchAdd(OAUtil.filter(s));
+            add = loanInterfaceWebapi.batchAdd(OAUtil.filter(s,salwebapi));
         } catch (Exception e) {
             webApiCatch = false;
             e.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryOtherDetailsServiceImpl.java

@@ -11,6 +11,7 @@ import org.jeecg.modules.iost.API.service.IQueryOtherDetailsService;
 import org.jeecg.modules.iost.API.service.kingdeejournal.IKingdeeSaveJournalService;
 import org.jeecg.modules.iost.API.service.oajournal.IOaSelectJournalService;
 import org.jeecg.modules.iost.API.webapi.OtherReimbursementInterfaceWebapi;
+import org.jeecg.modules.iost.API.webapi.SALorderWebapi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +30,8 @@ public class QueryOtherDetailsServiceImpl extends ServiceImpl<QueryOtherDetailsM
     private IOaSelectJournalService oaSelectJournalService;
     @Autowired
     private IKingdeeSaveJournalService KingdeeSaveJournalService;
+    @Autowired
+    private SALorderWebapi salwebapi;
     private int BusinessNo = 9;
 
     @Override
@@ -80,7 +83,7 @@ public class QueryOtherDetailsServiceImpl extends ServiceImpl<QueryOtherDetailsM
         Object result = jsonObject.get("result");
         String s = result.toString();
         try {
-            add = webapi.batchAdd(OAUtil.filter(s));
+            add = webapi.batchAdd(OAUtil.filter(s,salwebapi));
         } catch (Exception e) {
             webApiCatch = false;
             e.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/SALorderWebapi.java

 package org.jeecg.modules.iost.API.webapi;
 
+import kingdee.bos.webapi.client.K3CloudApiClient;
 import org.jeecg.modules.iost.API.Dao.CategoryDao;
 import org.jeecg.modules.iost.API.Dao.CategoryDaoSql;
 import org.jeecg.modules.iost.API.webapi.Interface.web_api;
@@ -32,6 +33,15 @@ public class SALorderWebapi implements web_api {
         return null;
     }
 
+    public List checkFiled(String filed,String key, String value,Map<String,K3CloudApiClient> clientMap){
+        List list = categoryDao.checkFiled(sFormId, new HashMap() {{
+            put(filed, filed);
+        }},  new HashMap() {{
+            put(key, "'"+value+"'");
+        }}, clientMap);
+        return list;
+    }
+
     @Override
     public List<Map<String, String>> select(Map<String, String> whereIn, String where) throws ParseException {
 

jeecg-boot-module-system/src/test/java/org/jeecg/QPOV_Base.java

+package org.jeecg;
+
+import lombok.Data;
+
+@Data
+public class QPOV_Base {
+    private QPOV_Base_Fname F_QPOV_Base;
+}

jeecg-boot-module-system/src/test/java/org/jeecg/QPOV_Base_Fname.java

+package org.jeecg;
+
+
+import lombok.Data;
+
+@Data
+public class QPOV_Base_Fname {
+    String FName;
+}

jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

@@ -2,6 +2,7 @@ package org.jeecg;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.Feature;
 import kingdee.bos.webapi.client.K3CloudApiClient;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
@@ -15,6 +16,7 @@ import org.jeecg.modules.iost.API.entity.LQKJ_t_IMSSyncDetails;
 import org.jeecg.modules.iost.API.vo.OaRequest;
 import org.jeecg.modules.iost.API.webapi.LQKJ_t_IMSSyncDetailsWebapi;
 import org.jeecg.modules.iost.API.webapi.LoanInterfaceWebapi;
+import org.jeecg.modules.iost.API.webapi.SALorderWebapi;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -31,14 +33,14 @@ public class SecurityToolsTest {
 //    static String uid = "Administrator";
 //    static String pwd = "888888";
 //    static int lang = 2052;
-    static String K3CloudURL = "http://192.168.2.243/k3cloud/";//指定地址
-    static String dbId = "6136b7c51f0e4f";
-    static String uid = "Administrator";
-    static String pwd = "888888";
+    static String K3CloudURL = "http://192.168.2.190/k3cloud/";//指定地址
+    static String dbId = "61a5ffe08bb8ba";
+    static String uid = "lt";
+    static String pwd = "666666";
     static int lang = 2052;
     K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
 
-    @Test
+//    @Test
     public void Test() {
         MyKeyPair mkeyPair = SecurityTools.generateKeyPair();
 
@@ -79,7 +81,7 @@ public class SecurityToolsTest {
         // System.out.println(new JSONObject(securityResp).toStringPretty());
     }
 
-    @Test
+//    @Test
     public void request() {
         List<Map<String, Object>> lists = new ArrayList<Map<String, Object>>();
         String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/list";
@@ -99,7 +101,7 @@ public class SecurityToolsTest {
         return jsonObject;
     }
 
-    @Test
+//    @Test
     public void S() {
         Random r = new Random();
 
@@ -111,7 +113,20 @@ public class SecurityToolsTest {
         System.out.println("a:" + a);
 
     }
+    static String sFormId = "k2d1839c385a04b62983eb4183c4745fd";
+    public List sFormId(Map<String,K3CloudApiClient> clientMap) {
 
+        org.jeecg.Test test = new org.jeecg.Test();
+
+        List list = test.checkFiled(sFormId, new HashMap() {{
+            put("fnumber", "fnumber");
+        }}, new HashMap() {{
+            put("fnumber", "'XXDD202105200009'");
+        }}, clientMap);
+        System.out.println("1"+list);
+        System.out.println("1"+clientMap);
+        return list;
+    }
     /**
      * 测试定时
      */
@@ -133,16 +148,16 @@ public class SecurityToolsTest {
 
                 List execute = client.execute(servicenameMap, strings, List.class);
 
-                System.out.println(execute);
-                for (Object o : execute) {
-                    System.out.println(execute);
-                }
-                if (null == execute) {
-                    System.out.println("你好");
-                } else {
-                    System.out.println("你好2");
-                }
-                System.out.println(execute.size());
+                System.out.println("dsads"+execute);
+//                for (Object o : execute) {
+//                    System.out.println(execute);
+//                }
+//                if (null == execute) {
+//                    System.out.println("你好");
+//                } else {
+//                    System.out.println("你好2");
+//                }
+//                System.out.println(execute.size());
 //                for (Map o : execute) {
 //                    System.out.println(o.get("F_LQKJ_SYNCCHECK"));
 //                }
@@ -156,10 +171,10 @@ public class SecurityToolsTest {
         System.out.println("end");
     }
 
-    @Autowired
-    LoanInterfaceWebapi loanInterfaceWebapi;
+//    @Autowired
+//    LoanInterfaceWebapi loanInterfaceWebapi;
 
-    @Test
+//    @Test
 //    @Scheduled(fixedDelay = 5000)
     public void timdsaded() throws InterruptedException {
         LoanInterfaceApi queryLoanDetailsApi = new LoanInterfaceApi();
@@ -179,7 +194,7 @@ public class SecurityToolsTest {
 
     }
 
-    @Async
+//    @Async
     public void dassdadsdads() throws InterruptedException {
         Thread.sleep(50000);
         System.out.println("nkklkjnlkkkkkkk");
@@ -188,7 +203,7 @@ public class SecurityToolsTest {
     @Autowired
     private LQKJ_t_IMSSyncDetailsWebapi webapi;
 
-    @Test
+//    @Test
 //    @Scheduled(fixedDelay = 5000)
     public void sadsad() {
         List<Map> objects = new ArrayList<>();
@@ -225,10 +240,41 @@ public class SecurityToolsTest {
         map.put("F_LQKJ_SYNCBILL", "PUR_Requisition");
         map.put("F_LQKJ_SYNCCHECK", "0");
         map.put("FID", "123456");
-        String o = "[{\"fid\":\"123\",\"f_lqkj_syncdataid\":\"sda\",\"f_lqkj_syncbill\":\"123\",\"f_lqkj_synccheck\":\"123\"}]";
-        String filter = OAUtil.filter(o);
+        String o = "[{\"fid\":\"123\",\"f_lqkj_syncdataid\":\"sda\",\"f_lqkj_syncbill\":\"123\",\"f_lqkj_synccheck\":\"123\",\"F_QPOV_BasE\":{\"FName\":\"QJFYQC001\"}}]";
+        String filter = filter(o);
         System.out.println(filter);
 //        LQKJ_t_IMSSyncDetails lqkj_t_imsSync = JSON.parseObject(JSON.toJSONString(map), LQKJ_t_IMSSyncDetails.class).setCreatetime(new Date());
 //        System.out.println(lqkj_t_imsSync);
     }
+     public String filter(String s) {//过滤掉不包含F_QPOV_Base字段的数据，并返回展示
+//        那个默认值的代码是：XXDD202105200009，名称是：QJFYQC001
+        Map QJFYQC001 = new HashMap<>();
+        QJFYQC001.put("FName", "QJFYQC001");
+        List list = JSON.parseObject(s, List.class, Feature.OrderedField);
+        List<Map> returnResults = new ArrayList<Map>();
+        Map<String,K3CloudApiClient> clientMap = new HashMap() {{
+            put("clientTwo", null);
+        }};
+        for (Object linkedHashMap : list) {
+            Map map = JSON.parseObject(linkedHashMap.toString(), LinkedHashMap.class);
+            QPOV_Base pojo = JSON.parseObject(linkedHashMap.toString(), QPOV_Base.class);
+            System.out.println("QPOV_Base"+pojo);
+            if (map.containsKey("F_QPOV_Base")) {
+                if (null != map.get("F_QPOV_Base")) {
+                    Map F_QPOV_Base = JSON.parseObject(map.get("F_QPOV_Base").toString(), LinkedHashMap.class);
+                    String fName = F_QPOV_Base.get("FName").toString();
+                    returnResults.add(map);
+                } else {
+                    map.put("F_QPOV_Base", QJFYQC001);
+                    returnResults.add(map);
+                }
+            } else {
+                map.put("F_QPOV_Base", QJFYQC001);
+                returnResults.add(map);
+            }
+        }
+//        if (null != end && 0 < end.size()) returnResult.put("缺少立项号/合同号", JsonUtil.Listjson(end));
+
+        return JsonUtil.Listjson(returnResults);
+    }
 }

jeecg-boot-module-system/src/test/java/org/jeecg/Test.java

+package org.jeecg;
+
+
+import kingdee.bos.webapi.client.K3CloudApiClient;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.jeecg.common.util.security.SecurityTools;
+import org.jeecg.common.util.security.entity.*;
+import org.jeecg.modules.iost.API.Util.HttpUtil;
+import org.jeecg.modules.iost.API.Util.HttpUtils;
+import org.jeecg.modules.iost.API.webapi.LQKJ_t_IMSSyncDetailsWebapi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.util.*;
+
+@Slf4j
+@EnableScheduling
+
+@Service
+
+public class Test {
+//    static String K3CloudURL = "http://116.62.129.2/K3Cloud/";
+//    static String dbId = "5b39dffef11ed4";
+//    static String uid = "administrator";
+//    static String pwd = "4009965012@lwkb";
+//    static int lang = 2052;
+    static String K3CloudURL = "https://cwxt.kingsware.cn:8090/k3cloud/";//指定地址
+//    static String dbId = "613ef0b02c911d";//测试环境数据中心
+static String dbId = "6017c3fce822bf";
+    static String uid = "kingdee";
+    static String pwd = "123456";
+    static int lang = 2052;
+    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+    //    static String K3CloudURL = "http://192.168.2.243/k3cloud/";//指定地址
+//    static String dbId = "6136b7c51f0e4f";
+//    static String uid = "Administrator";
+//    static String pwd = "888888";
+//    static int lang = 2052;
+//    K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
+    private String sFormId = "k2d1839c385a04b62983eb4183c4745fd";
+
+    @org.junit.Test
+    public void Test() {
+
+        Map<String,K3CloudApiClient> clientMap = new HashMap() {{
+            put("clientTwo", null);
+        }};
+        List list = this.checkFiled(sFormId, new HashMap() {{
+            put("fnumber", "fnumber");
+        }}, new HashMap() {{
+            put("fnumber", "'XXDD202105200009'");
+        }}, clientMap);
+        System.out.println("1"+list);
+        System.out.println("1"+clientMap);
+        List lists= this.checkFiled(sFormId, new HashMap() {{
+            put("fnumber", "fnumber");
+        }}, new HashMap() {{
+            put("fnumber", "'XXDD202105200009'");
+        }}, clientMap);
+        System.out.println(lists);
+    }
+    public List<Object> checkFiled(String sFormId, Map<String, String> key, Map<String, String> where, Map<String, K3CloudApiClient>  clientMap) {
+        List<List<Object>> list = null;
+        List<Object> objects=null;
+        Boolean result = false;
+        try {
+            K3CloudApiClient clientTwo=null;
+            if (null != clientMap.get("clientTwo")) {
+                clientTwo=clientMap.get("clientTwo");
+                System.out.println();
+                System.out.println();
+                System.out.println();
+                System.out.println("dsadsadsadsa"+clientMap);
+                System.out.println();
+                System.out.println();
+                System.out.println();
+                result = true;
+            } else {
+                result = client.login(dbId, uid, pwd, lang);
+                clientTwo = client;
+                clientMap.put("clientTwo",client);
+            }
+            if (result) {
+                String content;
+                if (where != null) {
+                    content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + Stringwhere(where) + "}";
+                } else {
+                    content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + "}";
+                }
+                list = clientTwo.executeBillQuery(content);
+            }
+            if (list.size()>0) {
+                 objects = list.get(0);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return objects;
+    }
+    private String Stringwhere(Map<String, String> map) {
+        String where = null;
+        for (String key : map.keySet()) {
+            String value = String.valueOf(map.get(key));
+            if (value != null && value != "") {
+                if (where != null) {
+                    where = where + " AND " + key + "=" + value;
+                } else {
+                    where = key + "=" + value + "";
+                }
+            }
+        }
+        if (where != null) {
+            return ",\"FilterString\":\"" + where + "\"";
+        }
+        return "";
+    }
+    private String Stringkey(Map<String, String> map) {
+        String Keys = null;
+        for (String key : map.keySet()) {
+            String value = String.valueOf(map.get(key));
+            if (value != null && value != "") {
+                if (Keys != null) {
+                    Keys = Keys + " , " + key;
+                } else {
+                    Keys = key;
+                }
+            }
+        }
+        if (Keys != null) {
+            return "\"FieldKeys\":\"" + Keys + "\"";
+        }
+        return "";
+    }
+}

jeecg-boot-module-system/src/test/java/org/jeecg/ToolsTest.java

@@ -51,6 +51,16 @@ public class ToolsTest {
 //    static int lang = 2052;
     K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
 
+    public static void main(String[] args) {
+        Map<String,K3CloudApiClient> clientMap = new HashMap() {{
+            put("clientTwo", null);
+        }};
+        SecurityToolsTest securityToolsTest = new SecurityToolsTest();
+        List list = securityToolsTest.sFormId(clientMap);
+        System.out.println("f"+clientMap);
+        Boolean b = null == list;
+        System.out.println(b);
+    }
     @Test
     public void Test() {
         MyKeyPair mkeyPair = SecurityTools.generateKeyPair();