生产代码提交

src/com/kingdee/eas/hr/org/app/OrgUnitOptFacadeControllerBeanEx.java

@@ -156,16 +156,17 @@ public class OrgUnitOptFacadeControllerBeanEx extends OrgUnitOptFacadeController
             //throw new BOSException(map.get("msg").toString());
             sb.append("OA同步错误信息：").append(oaMap.get("msg").toString()).append("\n");
         }
-        ////同步组织到IOT
-        //Map<String, List<Map<String, String>>> iotMap = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncOrgUnitToIot(id);
-        //List<Map<String, String>> data = iotMap.get("data");
-        //if (data.size() > 0) {
-        //    sb.append("Iot同步错误信息：");
-        //    for (int i = 0; i < data.size(); i++) {
-        //        Map<String, String> map = data.get(i);
-        //        sb.append(map.get("msg")).append("\n");
-        //    }
-        //}
+        //同步组织到IOT
+        //部署测试环境需要注释此行
+        Map<String, List<Map<String, String>>> iotMap = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncOrgUnitToIot(id);
+        List<Map<String, String>> data = iotMap.get("data");
+        if (data.size() > 0) {
+            sb.append("Iot同步错误信息：");
+            for (int i = 0; i < data.size(); i++) {
+                Map<String, String> map = data.get(i);
+                sb.append(map.get("msg")).append("\n");
+            }
+        }
         if (sb.length() > 0) {
             throw new BOSException(sb.toString());
         }

src/com/kingdee/eas/hr/org/app/PersonOptFacadeControllerBeanEx.java

@@ -3,9 +3,7 @@ package com.kingdee.eas.hr.org.app;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 import com.kingdee.bos.metadata.entity.SelectorItemCollection;
-import com.kingdee.eas.basedata.person.PersonFactory;
 import com.kingdee.eas.basedata.person.PersonInfo;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.custom.synctask.SyncTranForIOTFacadeFactory;
@@ -13,7 +11,6 @@ import com.kingdee.eas.custom.synctask.SyncTranForOAFacadeFactory;
 import com.kingdee.eas.framework.CoreBaseInfo;
 import com.kingdee.eas.hr.emp.app.PersonOptBaseInfo;
 import com.kingdee.eas.hr.emp.app.PersonOptFacadeControllerBean;
-import com.kingdee.util.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.util.Date;
@@ -36,7 +33,6 @@ public class PersonOptFacadeControllerBeanEx extends PersonOptFacadeControllerBe
         String number = person.getNumber();
         String id = person.getId().toString();
         personError(ctx, id, number);
-
         return iObjectPK;
 
     }
@@ -59,14 +55,14 @@ public class PersonOptFacadeControllerBeanEx extends PersonOptFacadeControllerBe
         PersonInfo person = (PersonInfo) model;
         String number = person.getNumber();
         String personId = person.getId().toString();
-        Map<String, String> map = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncPersonToIot(personId);
-        if (map != null) {
-            if (StringUtils.isEmpty(number)) {
-                PersonInfo personInfo = PersonFactory.getLocalInstance(ctx).getPersonInfo(new ObjectUuidPK(personId));
-                number = personInfo.getNumber();
-            }
-            throw new BOSException(map.get(number));
-        }
+        //Map<String, String> map = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncPersonToIot(personId);
+        //if (map != null) {
+        //    if (StringUtils.isEmpty(number)) {
+        //        PersonInfo personInfo = PersonFactory.getLocalInstance(ctx).getPersonInfo(new ObjectUuidPK(personId));
+        //        number = personInfo.getNumber();
+        //    }
+        //    throw new BOSException(map.get(number));
+        //}
     }
 
     private void personError(Context ctx, String id, String number) throws BOSException, EASBizException {
@@ -78,16 +74,17 @@ public class PersonOptFacadeControllerBeanEx extends PersonOptFacadeControllerBe
             //throw new BOSException(map.get("msg").toString());
             sb.append("OA同步错误信息：").append(oaMap.get("msg").toString());
         }
-        ////同步组织到IOT
-        //Map<String, List<Map<String, String>>> iotMap = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncPersonToIot(id);
-        //List<Map<String, String>> data = iotMap.get("data");
-        //if (data.size() > 0) {
-        //    sb.append("Iot同步错误信息：");
-        //    for (int i = 0; i < data.size(); i++) {
-        //        Map<String, String> map = data.get(i);
-        //        sb.append(map.get("msg")).append("\n");
-        //    }
-        //}
+        //同步人员到IOT
+        //部署测试环境需要注释此行
+        Map<String, List<Map<String, String>>> iotMap = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncPersonToIot(id);
+        List<Map<String, String>> data = iotMap.get("data");
+        if (data.size() > 0) {
+            sb.append("Iot同步错误信息：");
+            for (int i = 0; i < data.size(); i++) {
+                Map<String, String> map = data.get(i);
+                sb.append(map.get("msg")).append("\n");
+            }
+        }
         if (sb.length() > 0) {
             throw new BOSException(sb.toString());
         }

src/com/kingdee/eas/hr/org/app/PositionOptFacadeControllerBeanEx.java

@@ -3,18 +3,11 @@ package com.kingdee.eas.hr.org.app;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.Context;
 import com.kingdee.bos.dao.IObjectPK;
-import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
-import com.kingdee.eas.basedata.org.PositionFactory;
 import com.kingdee.eas.basedata.org.PositionInfo;
-import com.kingdee.eas.basedata.person.PersonFactory;
-import com.kingdee.eas.basedata.person.PersonInfo;
 import com.kingdee.eas.common.EASBizException;
-import com.kingdee.eas.custom.synctask.SyncTranForIOTFacadeFactory;
 import com.kingdee.eas.custom.synctask.SyncTranForOAFacadeFactory;
-import com.kingdee.util.StringUtils;
 import org.apache.log4j.Logger;
 
-import java.util.List;
 import java.util.Map;
 
 /**

websrc/com/kingdee/eas/custom/synctask/handler/EmployeeListHandlerEx.java

@@ -36,7 +36,7 @@ import java.util.*;
  * @apiNote 员工信息维护扩展
  */
 public class EmployeeListHandlerEx extends EmployeeListHandler {
-    public  Logger logger = Logger.getLogger(EmployeeListHandlerEx.class);
+    public Logger logger = Logger.getLogger(EmployeeListHandlerEx.class);
     public Context ctx = SHRContext.getInstance().getContext();
     public static Map<String, String> personStatusMap = new HashMap<String, String>();
 
@@ -109,6 +109,8 @@ public class EmployeeListHandlerEx extends EmployeeListHandler {
         }
     }
 
+
+
     /**
      * 同步IOT人员
      *   后续如需部署生产去掉Ex
@@ -145,8 +147,8 @@ public class EmployeeListHandlerEx extends EmployeeListHandler {
         personIds = AtsUtil.toSet(billId);
         //调用同步IOT人员
         try {
+            //部署测试环境需要注释此行
             Map<String, String> resultMap = SyncTranForIOTFacadeFactory.getLocalInstance(ctx).syncPersonToIot(billId);
-            //Map<String, String> resultMap = syncPersonToIot(billId);
             int failure = 0;
             int success = personIds.size();
             BatchMessageTipsHeader batchMessageTipsHeader = new BatchMessageTipsHeader();
@@ -166,19 +168,6 @@ public class EmployeeListHandlerEx extends EmployeeListHandler {
                 batchMessageTipsHeader.addResult(body);
             }
             success -= failure;
-            //for (int i = 0; i < list.size(); i++) {
-            //    BatchMessageTipsBody body = new BatchMessageTipsBody();
-            //    Map<String, String> map = list.get(i);
-            //    //personNameAndNumberMap
-            //    String personId = personNameAndNumberMap.get(map.get("id"));
-            //    //body.setId(map.get("id"));
-            //    body.setId(personId);
-            //    body.setMuitTipsState(Boolean.FALSE);
-            //    logger.error("result--personId--" + personId);
-            //    logger.error("result--msg--" + map.get("msg"));
-            //    body.setMuitTipsMessage(map.get("msg"));
-            //    batchMessageTipsHeader.addResult(body);
-            //}
             logger.error("handleEnableWithTips----- >> ");
             batchMessageTipsHeader.setBillId(billId);
             batchMessageTipsHeader.setFailureCount(failure);
@@ -197,7 +186,6 @@ public class EmployeeListHandlerEx extends EmployeeListHandler {
     }
 
 
-
     /**
      * 同步OA人员
      *

websrc/com/kingdee/eas/custom/synctask/handler/OrgUnitListHandlerEx.java

@@ -120,6 +120,7 @@ public class OrgUnitListHandlerEx extends OrgUnitListHandler {
                 billds = sb.toString();
             }
             adminOrgIds = AtsUtil.toSet(billds);
+            //部署测试环境需要注释此行
             ISyncTranForIOTFacade iSyncTranForIOTFacade = SyncTranForIOTFacadeFactory.getLocalInstance(ctx);
             Map<String, List<Map<String, String>>> result = iSyncTranForIOTFacade.syncOrgUnitToIot(billds);
             logger.error("result---" + result);

websrc/com/kingdee/eas/custom/synctask/handler/PositionListHandlerEx.java

@@ -47,6 +47,7 @@ public class PositionListHandlerEx extends PositionListHandler {
                 billIds = sb.toString();
             }
             positionIds = AtsUtil.toSet(billIds);
+            //部署测试环境需要注释此行
             ISyncTranForIOTFacade iSyncTranForIOTFacade = SyncTranForIOTFacadeFactory.getLocalInstance(ctx);
             Map<String, List<Map<String, String>>> result = iSyncTranForIOTFacade.syncOrgUnitToIot(billIds);
             logger.error("result---" + result);