#E10-28# 建模新增使用rpc接口创建优化

src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java

@@ -320,10 +320,15 @@ public class SelfServiceInfoCmd {
 
     /***
      *
-     * @param employeeId
+     * @param paramMap
      * @return
      */
-    public Map<String,Object> initSelfServiceData(String employeeId){
+    public Map<String,Object> initSelfServiceData(Map<String,Object> 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<String> paramList = new ArrayList<>(100);
             paramList.add(field_id);
             paramList.add(tenant_key);
@@ -387,7 +392,6 @@ public class SelfServiceInfoCmd {
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
             List<Map<String,Object>> 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;
     }

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<String, Object> paramMap = jucailinPortalUtils.request2Map(request);
+            paramMap.put("employeeId",employeeId);
+
+            dataMap = jucailinPortalService.initSelfServiceData(paramMap);
         }catch (Exception e){
             log.error("addSelfServiceCount-Exception:"+e.getMessage());
         }

src/main/java/com/weaver/seconddev/jcldoor/service/JucailinPortalService.java

@@ -54,7 +54,7 @@ public interface JucailinPortalService {
 
     public Map<String, Object> getUserType(HttpServletRequest request,SimpleEmployee simpleEmployee);
 
-    public Map<String, Object> initSelfServiceData(String employeeId);
+    public Map<String, Object> initSelfServiceData(Map<String, Object> paramMap);
 
     public Map<String, Object> updateSelfServiceData(String employeeId);
 

src/main/java/com/weaver/seconddev/jcldoor/service/impl/JucailinPortalServiceImpl.java

@@ -332,8 +332,8 @@ public class JucailinPortalServiceImpl implements JucailinPortalService {
     }
 
     @Override
-    public Map<String, Object> initSelfServiceData(String employeeId) {
+    public Map<String, Object> initSelfServiceData(Map<String, Object> paramMap) {
-        Map<String,Object> dataMap = selfServiceInfoCmd.initSelfServiceData(employeeId);
+        Map<String,Object> dataMap = selfServiceInfoCmd.initSelfServiceData(paramMap);
         return dataMap;
     }
 

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<EBDataReqDto> 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<String, Object> request2Map(HttpServletRequest request) {
+        // 参数Map
+        Map properties = request.getParameterMap();
+        // 返回值Map
+        Map<String, Object> returnMap = new HashMap<String, Object>();
+        Iterator<Map.Entry> 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;
+    }
+
 
 
 }