#E10-43# 优化入职及变动接口、serverless/Action 接口优化

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java

@@ -199,12 +199,12 @@ public class CockpitUserDataCmd {
 
             if(StringUtils.isNotBlank(employeeId)){
                 String dataSql =" select date_format(a.hiredate,'%Y-%m-%d') hiredate,resourceimageid,sex " +
-                        " from eteams.employee a   " +
-                        " where a.id = ?   " +
-                        " and a.tenant_key = ?  " +
-                        " and a.status = 'normal'   " +
-                        " and a.type = 'inside'" +
-                        " and delete_type = 0";
+                                " from eteams.employee a   " +
+                                " where a.id = ?   " +
+                                " and a.tenant_key = ?  " +
+                                " and a.status = 'normal'   " +
+                                " and a.type = 'inside'" +
+                                " and delete_type = 0";
 
                 log.error("getEmployeeHireData--dataSql:" + dataSql);
                 List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
@@ -277,48 +277,6 @@ public class CockpitUserDataCmd {
             log.error("PortalPerformanceInfoCmd :" + e);
         }
 
-        try {
-
-            log.error("CockpitUserDataCmd-333333");
-            Long avatarid = employee.getAvatarId();
-            log.error("CockpitUserDataCmd-avatarid:" + avatarid);
-
-            String avatarUrl = employee.getAvatar().getPreviewUrl();
-            log.error("CockpitUserDataCmd-test-avatarUrl666:" + avatarUrl);
-
-            Long SubCompanyId = employee.getDepartment().getSubCompanyId();
-            log.error("CockpitUserDataCmd-test-SubCompanyId7777:" + SubCompanyId);
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date hireDate = employee.getHiredate();
-            log.error("hireDate888:" + sdf.format(hireDate));
-
-        } catch (Exception e) {
-
-        }
-
-
-        try {
-
-            Long SubCompanyId = employee.getDepartment().getSubCompanyId();
-            log.error("CockpitUserDataCmd-test-SubCompanyId:" + SubCompanyId);
-
-        } catch (Exception e) {
-
-        }
-
-        try {
-            log.error("getSex:" + employee.getSex().getName());
-            log.error("getSex2:" + employee.getSex().getDescription());
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date hireDate = employee.getHiredate();
-            log.error("hireDate999:" + sdf.format(hireDate));
-
-        } catch (Exception e) {
-
-        }
-
         return userMap;
     }
 
@@ -508,7 +466,7 @@ public class CockpitUserDataCmd {
      * @return
      */
     public List<Map<String, Object>> getEmployeeChangeData(String employeeId, String tenantKey, String groupId, String sourceType) {
-        List<Map<String, Object>> changeList = new ArrayList<Map<String, Object>>();
+        List<Map<String, Object>> recordList = new ArrayList<Map<String, Object>>();
         try {
             String dataSql =" select t.change_id,date_format(k.change_date,'%Y-%m-%d') change_date,k.operator_type,p.data_type,p.data_value \n" +
                     " from eteams.hrm_empchange_user t\n" +
@@ -550,7 +508,7 @@ public class CockpitUserDataCmd {
             sqlparam.add(sqlParamEntity);
 
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam);
-            List<Map<String, Object>> recordList = databaseUtils.getDataSourceList(result);
+            recordList = databaseUtils.getDataSourceList(result);
             log.error("recordList2:"+recordList.size());
 
             if (CollectionUtils.isNotEmpty(recordList)) {
@@ -603,7 +561,7 @@ public class CockpitUserDataCmd {
             e.printStackTrace();
             log.error("getEmpChangeData:" + e);
         }
-        return changeList;
+        return recordList;
     }
 
     /***

src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataAction.java

@@ -9,15 +9,18 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.Map;
 
-@Service("esb_njjucailin_imdata")
-public class EsbRpcRemoteUpdateImDataimpl implements EsbServerlessRpcRemoteInterface {
+@Service("esb_njjucailin_im_Action")
+public class EsbRpcRemoteUpdateImDataAction implements EsbServerlessRpcRemoteInterface {
 
-    private static final Logger log = LoggerFactory.getLogger(EsbRpcRemoteUpdateImDataimpl.class);
+    private static final Logger log = LoggerFactory.getLogger(EsbRpcRemoteUpdateImDataAction.class);
 
     @Override
     public WeaResult<Map<String, Object>> execute(Map<String, Object> params) {
         log.error("EsbRpcRemoteUpdateImDataimpl");
         Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("code","200");
+        returnMap.put("name","111");
+        returnMap.put("data","2222");
         return WeaResult.success(returnMap);
     }
 }