From 7c2af7c48759d479d24ef838ce6505d13851b187 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Tue, 4 Jun 2024 15:30:03 +0800 Subject: [PATCH] =?UTF-8?q?#E10-43#=20=E4=BC=98=E5=8C=96=E5=85=A5=E8=81=8C?= =?UTF-8?q?=E5=8F=8A=E5=8F=98=E5=8A=A8=E6=8E=A5=E5=8F=A3=E3=80=81serverles?= =?UTF-8?q?s/Action=20=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/cmd/CockpitUserDataCmd.java | 60 +++---------------- ...va => EsbRpcRemoteUpdateImDataAction.java} | 9 ++- 2 files changed, 15 insertions(+), 54 deletions(-) rename src/main/java/com/weaver/seconddev/jcldoor/esb/{EsbRpcRemoteUpdateImDataimpl.java => EsbRpcRemoteUpdateImDataAction.java} (69%) diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java index 498a5fa..4835565 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java +++ b/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 sqlparam = new ArrayList(); @@ -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> getEmployeeChangeData(String employeeId, String tenantKey, String groupId, String sourceType) { - List> changeList = new ArrayList>(); + List> recordList = new ArrayList>(); 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 result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); - List> 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; } /*** diff --git a/src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java b/src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataAction.java similarity index 69% rename from src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java rename to src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataAction.java index f47afa2..f552411 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java +++ b/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> execute(Map params) { log.error("EsbRpcRemoteUpdateImDataimpl"); Map returnMap = new HashMap<>(); + returnMap.put("code","200"); + returnMap.put("name","111"); + returnMap.put("data","2222"); return WeaResult.success(returnMap); } }