From 32d44c532d522f388670865c074eaa8cd8b3102b Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Thu, 18 Apr 2024 18:27:10 +0800 Subject: [PATCH] =?UTF-8?q?#E10-28#=20=E5=BB=BA=E6=A8=A1=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=BF=E7=94=A8rpc=E6=8E=A5=E5=8F=A3=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcldoor/cmd/SelfServiceInfoCmd.java | 26 +++++++----- .../controller/JucailinPortalController.java | 8 +++- .../service/JucailinPortalService.java | 2 +- .../impl/JucailinPortalServiceImpl.java | 4 +- .../jcldoor/util/JucailinPortalUtils.java | 41 +++++++++++++++++++ 5 files changed, 67 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java index 08417f5..8fd8c30 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java @@ -320,10 +320,15 @@ public class SelfServiceInfoCmd { /*** * - * @param employeeId + * @param paramMap * @return */ - public Map initSelfServiceData(String employeeId){ + public Map initSelfServiceData(Map paramMap){ + + String employeeId = String.valueOf(paramMap.get("employeeId")); + String objId = String.valueOf(paramMap.get("objId")); + log.error("employeeId:"+employeeId); + log.error("objId:"+objId); String groupId = "weaver-ebuilder-form-service"; String sourceType = "LOGIC"; @@ -351,7 +356,7 @@ public class SelfServiceInfoCmd { recordMap.put("code","200"); recordMap.put("type","1"); }else{ - int count = initCustomServiceData(groupId,sourceType,field_id,employeeId,uf_zzfwrktaby_qy,uf_zzfwrkpz_qy); + int count = initCustomServiceData(groupId,sourceType,field_id,employeeId,uf_zzfwrktaby_qy,uf_zzfwrkpz_qy,objId); if(count > 0){ recordMap.put("code","-100"); }else{ @@ -374,11 +379,11 @@ public class SelfServiceInfoCmd { * @param sourceType * @return */ - public int initCustomServiceData(String groupId,String sourceType,String field_id,String employeeId,String uf_zzfwrktaby_qy,String uf_zzfwrkpz_qy){ + public int initCustomServiceData(String groupId,String sourceType,String field_id,String employeeId,String uf_zzfwrktaby_qy,String uf_zzfwrkpz_qy,String objId){ int errcount = 0; try{ String sql = " select name,value_key as taby from field_option where field_id=? and delete_type=0 and tenant_key = ?"; - log.info("sql:"+sql); + log.error("sql:"+sql); List paramList = new ArrayList<>(100); paramList.add(field_id); paramList.add(tenant_key); @@ -387,7 +392,6 @@ public class SelfServiceInfoCmd { Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); List> recordList = databaseUtils.getDataSourceList(result); - String objId = "977243418007322629"; String field_ry = "977243460998938628"; String field_tabymmc = "977680413716267009"; String field_qy = "977701557798322178"; @@ -416,14 +420,16 @@ public class SelfServiceInfoCmd { mainData.add(new EBDataReqDetailDto(field_xssx, i+"")); ebDataReqDto.setMainDatas(mainData); EBDataReqDtoList.add(ebDataReqDto); - log.error("EBDataReqDtoList:"+EBDataReqDtoList.size()); - if(EBDataReqDtoList !=null && EBDataReqDtoList.size()>0){ - jucailinPortalUtils.saveModeData(objId,employeeId,tenant_key,EBDataReqDtoList); - } } } + + log.error("EBDataReqDtoList:"+EBDataReqDtoList.size()); + jucailinPortalUtils.saveModeData(objId,employeeId,tenant_key,EBDataReqDtoList); + }catch (Exception e){ errcount++; + e.printStackTrace(); + log.error("Exception-e:"+e); } return errcount; } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java index f1b5d3a..168b49b 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java @@ -5,6 +5,7 @@ import com.weaver.common.base.entity.result.WeaResult; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.seconddev.jcldoor.service.JucailinPortalService; import com.weaver.seconddev.jcldoor.util.CommonUtils; +import com.weaver.seconddev.jcldoor.util.JucailinPortalUtils; import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.security.context.UserContext; import com.weaver.workflow.common.constant.list.listdimension.RequestListInitDimensionTabEnum; @@ -39,6 +40,8 @@ public class JucailinPortalController { @RpcReference(group = "workflow") WflRequestListRest wflRequestListRest; + @Autowired + private JucailinPortalUtils jucailinPortalUtils; /** * 人员基本信息接口 * @param request @@ -638,7 +641,10 @@ public class JucailinPortalController { } log.error("employeeId:"+employeeId); - dataMap = jucailinPortalService.initSelfServiceData(employeeId); + Map paramMap = jucailinPortalUtils.request2Map(request); + paramMap.put("employeeId",employeeId); + + dataMap = jucailinPortalService.initSelfServiceData(paramMap); }catch (Exception e){ log.error("addSelfServiceCount-Exception:"+e.getMessage()); } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/service/JucailinPortalService.java b/src/main/java/com/weaver/seconddev/jcldoor/service/JucailinPortalService.java index 286b185..d2e539c 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/service/JucailinPortalService.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/service/JucailinPortalService.java @@ -54,7 +54,7 @@ public interface JucailinPortalService { public Map getUserType(HttpServletRequest request,SimpleEmployee simpleEmployee); - public Map initSelfServiceData(String employeeId); + public Map initSelfServiceData(Map paramMap); public Map updateSelfServiceData(String employeeId); diff --git a/src/main/java/com/weaver/seconddev/jcldoor/service/impl/JucailinPortalServiceImpl.java b/src/main/java/com/weaver/seconddev/jcldoor/service/impl/JucailinPortalServiceImpl.java index e92f071..188c588 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/service/impl/JucailinPortalServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/service/impl/JucailinPortalServiceImpl.java @@ -332,8 +332,8 @@ public class JucailinPortalServiceImpl implements JucailinPortalService { } @Override - public Map initSelfServiceData(String employeeId) { - Map dataMap = selfServiceInfoCmd.initSelfServiceData(employeeId); + public Map initSelfServiceData(Map paramMap) { + Map dataMap = selfServiceInfoCmd.initSelfServiceData(paramMap); return dataMap; } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java index e9250e2..1b34147 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java @@ -23,6 +23,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.weaver.ebuilder.form.client.service.data.RemoteSimpleDataService; + +import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.*; @@ -611,6 +613,10 @@ public class JucailinPortalUtils { public void saveModeData(String objId,String operator,String tenant_key,List datas){ + log.error("saveModeData-objid:"+objId); + log.error("saveModeData-operator:"+operator); + log.error("saveModeData-tenant_key:"+tenant_key); + log.error("saveModeData-datas:"+datas.size()); EBDataChangeReqDto ebDataChangeReqDto = new EBDataChangeReqDto(); // 构建基础参数; objId 表单id, operator 操作人, tenantKey 租户 ebDataChangeReqDto.setHeader(new EBDataReqHeader(objId, operator,tenant_key)); @@ -643,6 +649,41 @@ public class JucailinPortalUtils { log.error("ebDataChangeResult:"+ebDataChangeResult.getStatus()); } + /*** + * + * @param request + * @return + */ + public Map request2Map(HttpServletRequest request) { + // 参数Map + Map properties = request.getParameterMap(); + // 返回值Map + Map returnMap = new HashMap(); + Iterator entries = properties.entrySet().iterator(); + Map.Entry entry; + String name = ""; + Object value = null; + while (entries.hasNext()) { + entry = (Map.Entry) entries.next(); + name = (String) entry.getKey(); + Object valueObj = entry.getValue(); + if (null == valueObj) { + value = null; + } else if (valueObj instanceof String[]) { + String[] values = (String[]) valueObj; + if (values.length == 1) { + value = values[0]; + } else { + value = values; + } + } else { + value = valueObj.toString(); + } + returnMap.put(name, value); + } + return returnMap; + } + }