提交

websrc/com/kingdee/eas/custom/beisen/synchronouspos/handler/StaffManageProjectListHandlerEx.java

@@ -52,7 +52,7 @@ public class StaffManageProjectListHandlerEx extends StaffManageProjectListHandl
                 List<Map<String, Object>> orgListMap = (List<Map<String, Object>>) result.get("orgListMap");
                 List<Map<String, Object>> posListMap = (List<Map<String, Object>>) result.get("posListMap");
                 int orgLen = orgListMap.size();
-                int batchSize = 100;
+                int batchSize = 50;
                 for (int i = 0; i < orgLen; i+=batchSize) {
                     examples.countPlusPlus();
                     int end = Math.min(i + batchSize, orgLen);

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/StaffManageProcess.java

@@ -51,6 +51,7 @@ public class StaffManageProcess{
                 listMap.add(responseJson);
                 list.add(pos);
             }
+
         }
         return result;
     }

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/SyncOrgStaffManageRunnable.java

@@ -25,7 +25,11 @@ public class SyncOrgStaffManageRunnable implements Runnable{
         this.listMap=listMap;
         this.countUtil=countUtil;
     }
+    public SyncOrgStaffManageRunnable(Context context, List<Map<String,Object>> listMap) {
+        this.context=context;
+        this.listMap=listMap;
 
+    }
     public Map<String, List<Map<String, Object>>> getResult() {
         return result;
     }
@@ -43,7 +47,9 @@ public class SyncOrgStaffManageRunnable implements Runnable{
         } catch (URISyntaxException e) {
             e.printStackTrace();
         }finally {
-            countUtil.countLessLess();
+            if(null!=countUtil) {
+                countUtil.countLessLess();
+            }
             state=true;
         }
     }

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/SyncPosStaffManageRunnable.java

@@ -25,7 +25,11 @@ public class SyncPosStaffManageRunnable implements Runnable{
         this.listMap=listMap;
         this.countUtil=countUtil;
     }
+    public SyncPosStaffManageRunnable(Context context, List<Map<String,Object>> listMap) {
+        this.context=context;
+        this.listMap=listMap;
 
+    }
     public Map<String, List<Map<String, Object>>> getResult() {
         return result;
     }
@@ -43,7 +47,9 @@ public class SyncPosStaffManageRunnable implements Runnable{
         } catch (URISyntaxException e) {
             e.printStackTrace();
         }finally {
-            countUtil.countLessLess();
+            if(null!=countUtil) {
+                countUtil.countLessLess();
+            }
             state=true;
         }
     }

websrc/com/kingdee/eas/custom/beisen/synchronouspos/osf/SyncStaffManageOSFService.java

@@ -1,5 +1,6 @@
 package com.kingdee.eas.custom.beisen.synchronouspos.osf;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.kingdee.bos.BOSException;
@@ -10,8 +11,11 @@ import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.custom.beisen.utils.BeiSenUtils;
 import com.kingdee.eas.custom.beisen.utils.BeisenParamByPropertiesUtil;
 import com.kingdee.eas.custom.beisen.utils.Helper;
+import com.kingdee.eas.util.ExceptionUtil;
 import com.kingdee.eas.util.app.DbUtil;
 import com.kingdee.jdbc.rowset.IRowSet;
+import com.kingdee.shr.base.syssetting.IMSFServiceFacade;
+import com.kingdee.shr.base.syssetting.MSFServiceFacadeFactory;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -20,6 +24,8 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 编制同步
@@ -28,28 +34,28 @@ import java.util.Map;
  * author: lhbj <br>
  * version: 1.0 <br>
  */
-public  class SyncStaffManageOSFService implements IHRMsfService {
+public class SyncStaffManageOSFService implements IHRMsfService {
 
 
-    public  Map<String,List<Map<String,Object>>> orgProcess(Context context,List<Map<String,Object>> orgListMap) throws IOException, URISyntaxException {
-        return new StaffManageProcess().orgProcess(context,orgListMap);
+    public Map<String, List<Map<String, Object>>> orgProcess(Context context, List<Map<String, Object>> orgListMap) throws IOException, URISyntaxException {
+        return new StaffManageProcess().orgProcess(context, orgListMap);
     }
 
-    public  Map<String,List<Map<String,Object>>> posProcess(Context context,List<Map<String,Object>> posListMap) throws IOException, URISyntaxException {
-        return new StaffManageProcess().posProcess(context,posListMap);
+    public Map<String, List<Map<String, Object>>> posProcess(Context context, List<Map<String, Object>> posListMap) throws IOException, URISyntaxException {
+        return new StaffManageProcess().posProcess(context, posListMap);
     }
 
     @Override
     public Object process(Context context, Map<String, Object> map) throws EASBizException, BOSException {
         String mack = (String) map.get("mack");
 
-        Map<String,List<Map<String,Object>>> result = Maps.newHashMap();
-        List<Map<String,Object>> list = Lists.newArrayList();
-        List<Map<String,Object>> listMap = Lists.newArrayList();
-        List<Map<String,Object>> orgListMap = Lists.newArrayList();
-        List<Map<String,Object>> posListMap = Lists.newArrayList();
-        result.put("list",list);
-        result.put("listMap",listMap);
+        Map<String, Object> result = Maps.newHashMap();
+        List<Map<String, Object>> list = Lists.newArrayList();
+        List<Map<String, Object>> listMap = Lists.newArrayList();
+        List<Map<String, Object>> orgListMap = Lists.newArrayList();
+        List<Map<String, Object>> posListMap = Lists.newArrayList();
+        result.put("list", list);
+        result.put("listMap", listMap);
         String posPath = (String) map.get("posPath");
         String orgPath = (String) map.get("orgPath");
         StringBuilder sql = new StringBuilder();
@@ -63,11 +69,11 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
         sql.append(" and FState = 1 ");
         sql.append(" and FChannel = 1 ");
         IRowSet rs = DbUtil.executeQuery(context, sql.toString());
-        try{
+        try {
             BeisenParamByPropertiesUtil posUtil = new BeisenParamByPropertiesUtil(posPath);
-            Map<String,String> poskeyMap = posUtil.getConfig();
+            Map<String, String> poskeyMap = posUtil.getConfig();
             BeisenParamByPropertiesUtil orgUtil = new BeisenParamByPropertiesUtil(orgPath);
-            Map<String,String> orgkeyMap = orgUtil.getConfig();
+            Map<String, String> orgkeyMap = orgUtil.getConfig();
             while (rs.next()) {
                 String fid = rs.getString("fid");
                 String FTableName = rs.getString("FTableName");
@@ -75,6 +81,7 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 StringBuilder selSql = new StringBuilder();
                 selSql.append(" select * from ( ");
                 selSql.append(" select 'org' orgpos,org.fid posId,org.Fnumber orgOriginalId,org.FParentID,org.fname_l2 orgPosName,org.FDisplayName_L2 staffName, ");
+                //selSql.append("         org.Fid CFOriginalId, ");
                 selSql.append("         org.Fnumber CFOriginalId, ");
                 //selSql.append("         (case when staff.FControlWay=0 then 3 when staff.FControlWay=1 then 2 else 1 end) FControlWay, ");
                 selSql.append("         staff.FControlWay FControlWay, ");
@@ -84,7 +91,7 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 selSql.append("         (staff.FState) FState,staff.FContainSub, ");
                 selSql.append(" 1 orgPosStatus ");
                 selSql.append(" from ");
-                selSql.append(" "+FTableName+" staff ");
+                selSql.append(" " + FTableName + " staff ");
                 selSql.append(" left join t_org_admin org on org.fid=staff.FAdminOrgID ");
                 selSql.append(" left join t_org_position pos on pos.fid = staff.FpositionID ");
                 selSql.append(" where pos.fid is null and org.FReserveFieldFirst is not null ");
@@ -98,7 +105,7 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 selSql.append("         (staff.FState) FState,staff.FContainSub, ");
                 selSql.append("  (case when pos.FDELETEDSTATUS=2 then 0 else 1 end) orgPosStatus ");
                 selSql.append(" from ");
-                selSql.append(" "+FTableName+" staff ");
+                selSql.append(" " + FTableName + " staff ");
                 selSql.append(" left join t_org_position pos on pos.fid = staff.FpositionID ");
                 selSql.append(" left join t_org_admin org on org.fid=pos.FADMINORGUNITID ");
                 selSql.append(" where pos.fid is not null and pos.CFOriginalId is not null ");
@@ -106,45 +113,55 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
                 IRowSet rsSel = DbUtil.executeQuery(context, selSql.toString());
                 // 获取访问令牌
 
-                while (rsSel.next()){
-                    String orgpos= rsSel.getString("orgpos");
-                    if("org".equals(orgpos)){
-                        Map<String, Object> pos = this.getPostData(orgkeyMap,rsSel);
-                        if(null!=pos){
+                while (rsSel.next()) {
+                    String orgpos = rsSel.getString("orgpos");
+                    if ("org".equals(orgpos)) {
+                        Map<String, Object> pos = this.getPostData(orgkeyMap, rsSel);
+                        if (null != pos) {
                             orgListMap.add(pos);
                         }
-                    }else if ("pos".equals(orgpos)){
-                        Map<String, Object> pos = this.getPostData(poskeyMap,rsSel);
-                        if(null!=pos){
+                    } else if ("pos".equals(orgpos)) {
+                        Map<String, Object> pos = this.getPostData(poskeyMap, rsSel);
+                        if (null != pos) {
                             posListMap.add(pos);
                         }
                     }
                 }
-                if("org".equals(mack)||"pos".equals(mack)){
-                    //Map<String,List<Map<String,Object>>> resultOrg = this.orgProcess(context,orgListMap);
-                    result.put("orgListMap",orgListMap);
-                    result.put("posListMap",posListMap);
-                } else {
-                    result.put("orgListMap",orgListMap);
-                    result.put("posListMap",posListMap);
-                    Map<String,List<Map<String,Object>>> resultOrg = this.orgProcess(context,orgListMap);
-                    Map<String,List<Map<String,Object>>> resultPos = this.posProcess(context,posListMap);
-                    list.addAll(resultOrg.get("list"));
-                    listMap.addAll(resultOrg.get("listMap"));
-                    list.addAll(resultPos.get("list"));
-                    listMap.addAll(resultPos.get("listMap"));
-                    result.put("orgListMap",orgListMap);
-                    result.put("posListMap",posListMap);
+                result.put("orgListMap", orgListMap);
+                result.put("posListMap", posListMap);
+
+            }
+            if ("org".equals(mack) || "pos".equals(mack)) {
+                //Map<String,List<Map<String,Object>>> resultOrg = this.orgProcess(context,orgListMap);
+            } else {
+                ExecutorService executor = Executors.newFixedThreadPool(4);
+                int orgLen = orgListMap.size();
+                int batchSize = 50;
+                for (int i = 0; i < orgLen; i += batchSize) {
+                    int end = Math.min(i + batchSize, orgLen);
+                    List<Map<String, Object>> orgSubListMap = orgListMap.subList(i, end);
+                    SyncOrgStaffManageRunnable syncOrg = new SyncOrgStaffManageRunnable(context, orgSubListMap);
+                    executor.submit(syncOrg);
                 }
+
+                int posLen = posListMap.size();
+                for (int i = 0; i < posLen; i += batchSize) {
+                    int end = Math.min(i + batchSize, posLen);
+                    List<Map<String, Object>> posSubListMap = posListMap.subList(i, end);
+                    SyncPosStaffManageRunnable syncOrg = new SyncPosStaffManageRunnable(context, posSubListMap);
+                    executor.submit(syncOrg);
+                }
+                executor.shutdown();
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            throw new BOSException(e);
-        }finally {
+            result.put("errMsg", ExceptionUtil.getExcLinkStackTrace(e));
+        } finally {
 
         }
         return result;
     }
+
     /**
      * shr系统数据组装北森请求参数
      *
@@ -153,91 +170,91 @@ public  class SyncStaffManageOSFService implements IHRMsfService {
      * @return
      * @throws SQLException
      */
-    protected Map<String, Object> getPostData(Map<String,String> keyMap, IRowSet rowSet) throws SQLException {
+    protected Map<String, Object> getPostData(Map<String, String> keyMap, IRowSet rowSet) throws SQLException {
         Map<String, Object> pos = Maps.newHashMap();
-        if (null!=rowSet){
-            for(Map.Entry<String,String> entry : keyMap.entrySet()){
+        if (null != rowSet) {
+            for (Map.Entry<String, String> entry : keyMap.entrySet()) {
                 String shrKey = entry.getKey();
                 String beisenKey = entry.getValue();
-                if(shrKey.indexOf(".")>0){
-                    String[] keys=shrKey.split("\\.");
-                    if(2==keys.length){
-                        Map<String,Object> map1 = (Map<String, Object>) pos.get(keys[0]);
-                        if(null==map1){
-                            map1=Maps.newHashMap();
-                            pos.put(keys[0],map1);
+                if (shrKey.indexOf(".") > 0) {
+                    String[] keys = shrKey.split("\\.");
+                    if (2 == keys.length) {
+                        Map<String, Object> map1 = (Map<String, Object>) pos.get(keys[0]);
+                        if (null == map1) {
+                            map1 = Maps.newHashMap();
+                            pos.put(keys[0], map1);
                         }
                         String valueStr = rowSet.getString(keys[1]);
-                        if(beisenKey.indexOf(",")>0) {
+                        if (beisenKey.indexOf(",") > 0) {
                             String[] beisenKeys = beisenKey.split(",");
                             Object value = null;
 
-                            if("integer".equals(beisenKeys[1])){
-                                if(null!=valueStr){
-                                    value=Integer.parseInt(valueStr);
+                            if ("integer".equals(beisenKeys[1])) {
+                                if (null != valueStr) {
+                                    value = Integer.parseInt(valueStr);
                                 }
-                            }else {
+                            } else {
                                 value = valueStr;
                             }
-                            if(null!=value) {
+                            if (null != value) {
                                 map1.put(beisenKeys[0], value);
                             }
-                        }else {
+                        } else {
 
-                            if(null!=valueStr) {
+                            if (null != valueStr) {
                                 map1.put(beisenKey, valueStr);
                             }
                         }
-                    }else if (3==keys.length){
-                        Map<String,Object> map1 = (Map<String, Object>) pos.get(keys[0]);
-                        if(null==map1){
-                            map1=Maps.newHashMap();
-                            pos.put(keys[0],map1);
+                    } else if (3 == keys.length) {
+                        Map<String, Object> map1 = (Map<String, Object>) pos.get(keys[0]);
+                        if (null == map1) {
+                            map1 = Maps.newHashMap();
+                            pos.put(keys[0], map1);
                         }
-                        Map<String,Object> map2 = (Map<String, Object>) map1.get(keys[1]);
-                        if(null==map2){
-                            map2=Maps.newHashMap();
-                            map1.put(keys[1],map1);
+                        Map<String, Object> map2 = (Map<String, Object>) map1.get(keys[1]);
+                        if (null == map2) {
+                            map2 = Maps.newHashMap();
+                            map1.put(keys[1], map1);
                         }
                         String valueStr = rowSet.getString(keys[2]);
-                        if(beisenKey.indexOf(",")>0) {
+                        if (beisenKey.indexOf(",") > 0) {
                             String[] beisenKeys = beisenKey.split(",");
                             Object value = null;
 
-                            if("integer".equals(beisenKeys[1])){
-                                if(null!=valueStr){
-                                    value=Integer.parseInt(valueStr);
+                            if ("integer".equals(beisenKeys[1])) {
+                                if (null != valueStr) {
+                                    value = Integer.parseInt(valueStr);
                                 }
-                            }else {
+                            } else {
                                 value = valueStr;
                             }
-                            if(null!=value) {
+                            if (null != value) {
                                 map2.put(beisenKeys[0], value);
                             }
-                        }else {
-                            if(null!=valueStr) {
-                                map2.put(beisenKey,valueStr);
+                        } else {
+                            if (null != valueStr) {
+                                map2.put(beisenKey, valueStr);
                             }
                         }
                     }
-                }else {
+                } else {
                     String valueStr = rowSet.getString(shrKey);
-                    if(beisenKey.indexOf(",")>0) {
+                    if (beisenKey.indexOf(",") > 0) {
                         String[] beisenKeys = beisenKey.split(",");
                         Object value = null;
-                        if("integer".equals(beisenKeys[1])){
-                            if(null!=valueStr){
-                                value=Integer.parseInt(valueStr);
+                        if ("integer".equals(beisenKeys[1])) {
+                            if (null != valueStr) {
+                                value = Integer.parseInt(valueStr);
                             }
-                        }else {
+                        } else {
                             value = valueStr;
                         }
-                        if(null!=value) {
-                            pos.put(beisenKeys[0],value);
+                        if (null != value) {
+                            pos.put(beisenKeys[0], value);
                         }
-                    }else {
-                        if(null!=valueStr) {
-                            pos.put(beisenKey,valueStr);
+                    } else {
+                        if (null != valueStr) {
+                            pos.put(beisenKey, valueStr);
                         }
                     }
                 }