From 79d097835259bad6359212d37d74e4087aa13f3e Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Tue, 4 Jun 2024 11:05:48 +0800 Subject: [PATCH] =?UTF-8?q?#E10-43#=20=E5=A2=9E=E5=8A=A0=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=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0serverless/Action=E9=AA=8C=E8=AF=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/cmd/CockpitUserDataCmd.java | 236 +++++++++++++++--- .../esb/EsbRpcRemoteUpdateImDataimpl.java | 23 ++ 2 files changed, 221 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java 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 fcf48be..565865c 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java @@ -2,7 +2,6 @@ package com.weaver.seconddev.cockpit.cmd; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; -import com.weaver.seconddev.cockpit.util.CommonUtils; import com.weaver.seconddev.cockpit.util.DatabaseUtils; import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils; import com.weaver.teams.domain.user.SimpleEmployee; @@ -239,19 +238,36 @@ public class CockpitUserDataCmd { Long avatarid = employee.getAvatarId(); log.error("CockpitUserDataCmd-avatarid:" + avatarid); - String url = employee.getAvatar().getUrl(); + String avatarUrl = employee.getAvatar().getPreviewUrl(); + log.error("CockpitUserDataCmd-test-avatarUrl666:" + avatarUrl); - log.error("CockpitUserDataCmd-url:" + url); + 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 { - String avatarUrl = employee.getAvatar().getPreviewUrl(); - log.error("CockpitUserDataCmd-test-avatarUrl:" + avatarUrl); Long SubCompanyId = employee.getDepartment().getSubCompanyId(); log.error("CockpitUserDataCmd-test-SubCompanyId:" + SubCompanyId); + } catch (Exception e) { + + } + + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date hireDate = employee.getHiredate(); - log.error("hireDate:" + sdf.format(hireDate)); + log.error("hireDate999:" + sdf.format(hireDate)); } catch (Exception e) { @@ -318,6 +334,8 @@ public class CockpitUserDataCmd { if (hireMap != null && hireMap.size() > 0) { changeList.add(hireMap); } + + log.error("changeList:"+changeList.size()); //变更 List> changeDataList = getEmployeeChangeData(employeeId, tenantKey, groupId, sourceType); if (CollectionUtils.isNotEmpty(changeDataList)) { @@ -355,18 +373,25 @@ public class CockpitUserDataCmd { " and a.type = 'inside'" + " and delete_type = 0"; - log.error("getuserIfo--dataSql:" + dataSql); - List strlist = new ArrayList<>(100); - strlist.add(employeeId + ""); - strlist.add(tenantKey); - List sqlparam = databaseUtils.getSqlParamEntity(strlist); + log.error("getEmployeeHireData--dataSql:" + dataSql); + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeId + ""); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); List> recordList = databaseUtils.getDataSourceList(result); if (CollectionUtils.isNotEmpty(recordList)) { Map recordMap = recordList.get(0); - hiredate = CommonUtils.null2String(recordMap.get("hiredate")); + hiredate = String.valueOf(recordMap.get("hiredate")); } - + log.error("hiredate:"+hiredate); if (StringUtils.isNotBlank(hiredate)) { map.put("changedate", hiredate); map.put("operator_type", "entry"); @@ -427,39 +452,65 @@ public class CockpitUserDataCmd { // // } - + /*** + * + * @param employeeId + * @param tenantKey + * @param groupId + * @param sourceType + * @return + */ public List> getEmployeeChangeData(String employeeId, String tenantKey, String groupId, String sourceType) { List> changeList = 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" + - " inner join eteams.hrm_empchange k on k.id = t.change_id\n" + - " inner join eteams.hrm_empchange_userdetail p on p.change_id = t.CHANGE_ID\n" + - " where t.employeeid = ?\n" + - " and length(p.data_value)>0\n" + - " and k.batch_status = 2' \n" + - " and t.delete_type = 0 \n" + - " and t.tenant_key = ? \n" + - " and p.delete_type = 0 \n" + - " and p.tenant_key = ? \n" + - " and k.delete_type = 0 \n" + - " and k.tenant_key = ? " + - " and p.data_type in('newDepartment','newPosition','newSuperior','changeStatus')\n " + - " order by k.change_date \n"; - - log.error("getuserIfo--dataSql:" + dataSql); - List strlist = new ArrayList<>(100); - strlist.add(employeeId + ""); - strlist.add(tenantKey); - strlist.add(tenantKey); - strlist.add(tenantKey); - List sqlparam = databaseUtils.getSqlParamEntity(strlist); + 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" + + " inner join eteams.hrm_empchange k on k.id = t.change_id\n" + + " inner join eteams.hrm_empchange_userdetail p on p.change_id = t.change_id\n" + + " where t.employeeid = ? \n" + + " and length(p.data_value)>0 \n" + + " and k.batch_status = 2' \n" + + " and t.delete_type = 0 \n" + + " and t.tenant_key = ? \n" + + " and p.delete_type = 0 \n" + + " and p.tenant_key = ? \n" + + " and k.delete_type = 0 \n" + + " and k.tenant_key = ? " + + " and p.data_type in('newDepartment','newPosition','newSuperior','changeStatus') \n " + + " order by k.change_date \n"; + + log.error("getEmployeeChangeData--dataSql:" + dataSql); + + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeId + ""); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); List> recordList = databaseUtils.getDataSourceList(result); + log.error("recordList2:"+recordList.size()); + if (CollectionUtils.isNotEmpty(recordList)) { for (int i = 0; i < recordList.size(); i++) { Map recordMap = recordList.get(i); String operator_type = String.valueOf(recordMap.get("operator_type")); + log.error("operator_type:"+operator_type); String operator_type_name = ""; if ("trial".equals(operator_type)) { @@ -483,17 +534,20 @@ public class CockpitUserDataCmd { } recordMap.put("operator_type_name", operator_type_name); String data_type = String.valueOf(recordMap.get("data_type")); + log.error("data_type:"+data_type); String data_type_name = ""; String data_value = String.valueOf(recordMap.get("data_value")); String data_value_name = ""; if ("newDepartment".equals(data_type)) { data_type_name = "部门"; + data_value_name = getDepartmentName(data_value,tenantKey,sourceType,groupId); } else if ("newPosition".equals(data_type)) { data_type_name = "岗位"; + data_value_name = getPositionName(data_value,tenantKey,sourceType,groupId); } else if ("newSuperior".equals(data_type)) { data_type_name = "上级"; + data_value_name = getSuperiorName(data_value,tenantKey,sourceType,groupId); } - recordMap.put("data_type_name", data_type_name); recordMap.put("data_value_name", data_value_name); } @@ -504,4 +558,110 @@ public class CockpitUserDataCmd { } return changeList; } + + /*** + * + * @param departmentid + * @param tenantKey + * @param sourceType + * @param groupId + * @return + */ + public String getDepartmentName(String departmentid,String tenantKey,String sourceType,String groupId){ +// select name from Department where id=9080991104676336702 + String deptname = "" ; + try{ + String dataSql =" select name from eteams.department where id= ? tenant_key = ? "; + log.error("getDepartmentName--dataSql:" + dataSql); + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(departmentid + ""); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + log.error("getDepartmentName--recordList:" + recordList.size()); + if(!recordList.isEmpty() && recordList.size()>0){ + deptname = String.valueOf(recordList.get(0).get("name")); + } + log.error("getDepartmentName--deptname:" + deptname); + }catch (Exception e){ + e.printStackTrace(); + log.error("getDepartmentName:"+e); + } + return deptname; + } + + + public String getPositionName(String positionid,String tenantKey,String sourceType,String groupId){ +// select name from Department where id=9080991104676336702 + String positionName = "" ; + try{ + String dataSql =" select name from eteams.position where id= ? tenant_key = ? "; + log.error("getPositionName--dataSql:" + dataSql); + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(positionid); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + log.error("getPositionName--recordList:" + recordList.size()); + + if(!recordList.isEmpty() && recordList.size()>0){ + positionName = String.valueOf(recordList.get(0).get("name")); + } + log.error("getPositionName--positionName:" + positionName); + }catch (Exception e){ + e.printStackTrace(); + log.error("getPositionName:"+e); + } + return positionName; + } + + + + public String getSuperiorName(String employeeid,String tenantKey,String sourceType,String groupId){ +// select name from Department where id=9080991104676336702 + String employeeName = "" ; + try{ + String dataSql =" select name from eteams.employee where id= ? tenant_key = ? "; + log.error("getSuperiorName--dataSql:" + dataSql); + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.LONG); + sqlParamEntity.setValue(employeeid); + sqlparam.add(sqlParamEntity); + + sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(tenantKey); + sqlparam.add(sqlParamEntity); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + log.error("getSuperiorName--recordList:" + recordList.size()); + if(!recordList.isEmpty() && recordList.size()>0){ + employeeName = String.valueOf(recordList.get(0).get("name")); + } + log.error("getSuperiorName--employeeName:" + employeeName); + }catch (Exception e){ + e.printStackTrace(); + log.error("getPositionName:"+e); + } + return employeeName; + } + + + } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java b/src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java new file mode 100644 index 0000000..f47afa2 --- /dev/null +++ b/src/main/java/com/weaver/seconddev/jcldoor/esb/EsbRpcRemoteUpdateImDataimpl.java @@ -0,0 +1,23 @@ +package com.weaver.seconddev.jcldoor.esb; + +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +@Service("esb_njjucailin_imdata") +public class EsbRpcRemoteUpdateImDataimpl implements EsbServerlessRpcRemoteInterface { + + private static final Logger log = LoggerFactory.getLogger(EsbRpcRemoteUpdateImDataimpl.class); + + @Override + public WeaResult> execute(Map params) { + log.error("EsbRpcRemoteUpdateImDataimpl"); + Map returnMap = new HashMap<>(); + return WeaResult.success(returnMap); + } +}