#E10-31# 优化群聊等eb表rpc接口fieldid的获取

src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java

@@ -10,8 +10,10 @@ import com.weaver.ebuilder.form.client.entity.data.EBDataReqDetailDto;
 import com.weaver.ebuilder.form.client.entity.data.EBDataReqDto;
 import com.weaver.ebuilder.form.client.entity.obj.Obj;
 import com.weaver.ebuilder.form.client.service.emobile.IEtFormDatasetService;
+import com.weaver.ebuilder.form.client.service.obj.RemoteEBObjService;
 import com.weaver.framework.remote.client.rest.RestClient;
 import com.weaver.framework.rpc.annotation.RpcReference;
+import com.weaver.framework.rpc.context.impl.TenantRpcContext;
 import com.weaver.mc.api.async.AsyncSystemMessageRest;
 import com.weaver.mc.api.rest.SystemMessageRest;
 import com.weaver.seconddev.jcldoor.util.ChatDayUtils;
@@ -70,8 +72,11 @@ public class HrmSelfHelpController {
     @RpcReference
     private RemoteBlogInfoService remoteBlogInfoService ;
 
+    @RpcReference(group = "ebuilderform")
+    private RemoteEBObjService remoteEBObjService;
+
     @RpcReference
-    private IEtFormDatasetService ietFormDatasetService;
+    private IEtFormDatasetService IEtFormDatasetService;
 
     @Autowired
     private DatabaseUtils databaseUtils;
@@ -79,7 +84,6 @@ public class HrmSelfHelpController {
     @Autowired
     private JucailinPortalUtils jucailinPortalUtils;
 
-
     @Autowired
     private ChatDayUtils chatDayUtils;
 
@@ -1831,16 +1835,19 @@ public class HrmSelfHelpController {
     @WeaPermission(publicPermission = true)
     public WeaResult<Object> test200(HttpServletRequest request){
 
-
         Map<String,Object> dataMap = new HashMap<String,Object>();
         dataMap.put("test","test200");
         try {
-            String appid = request.getParameter("appid");
+            String objid = request.getParameter("objid");
-            List<Obj> list = ietFormDatasetService.getTables(appid);
+            if(StringUtils.isNotBlank(objid)) {
+                Long obj_id = Long.valueOf(objid);
+                WeaResult<Obj> list = remoteEBObjService.getObjInfo(obj_id,tenant_key);
                 dataMap.put("datas",list);
+            }
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("testSapi8:"+e);
+            log.error("test200:"+e);
+            dataMap.put("message",e.getMessage());
         }
 
         return WeaResult.success(dataMap);
@@ -1859,17 +1866,38 @@ public class HrmSelfHelpController {
         try {
             if(StringUtils.isNotBlank(objid)){
                 Long obj_id = Long.valueOf(objid);
-                log.error("obj_id:"+obj_id);
+                List<Obj> fieldlist = remoteEBObjService.getAllTablesByMasterId(obj_id,tenant_key);
-                List<String> columnNameList = Arrays.asList(columnnames.split(","));
+                dataMap.put("datas",fieldlist);
-                Map<String,String> fieldMap = jucailinPortalUtils.getFieldIdByColumnName(obj_id,columnNameList,false);
-                dataMap.put("datas",fieldMap);
             }
         } catch (Exception e) {
             e.printStackTrace();
             log.error("test201:"+e);
-            dataMap.put("test201","1");
+            dataMap.put("message",e.getMessage());
+        }
+        return WeaResult.success(dataMap);
+    }
+
+
+    @GetMapping("/test202")
+    @WeaPermission(publicPermission = true)
+    public WeaResult<Object> test202(HttpServletRequest request){
+
+        Map<String,Object> dataMap = new HashMap<String,Object>();
+        dataMap.put("test","test202");
+        try {
+            String TenantKey = TenantRpcContext.getTenantKey();
+            dataMap.put("TenantKey",TenantKey);
+            String appIds = request.getParameter("appIds");
+            List<Obj> list = IEtFormDatasetService.getTables(appIds);
+            dataMap.put("datas",list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("test202:"+e);
+            dataMap.put("message",e.getMessage());
         }
         return WeaResult.success(dataMap);
     }
 
+
+
 }

src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java

@@ -44,8 +44,7 @@ public class JucailinPortalUtils {
     @RpcReference(group="ebuilderform")
     private RemoteSimpleDataService remoteSimpleDataService;
 
-    @RpcReference
+
-    private IEtFormDatasetService ietFormDatasetService;
 
     public String getUfPropData(String pkey,String tenant_key) {
         String pvalue = "" ;
@@ -736,31 +735,7 @@ public class JucailinPortalUtils {
         return returnMap;
     }
 
-    /***
+
-     *
-     * @param objid
-     * @param columnNameList
-     * @param needChild
-     * @return
-     */
-    public Map<String,String> getFieldIdByColumnName(Long objid,List<String> columnNameList,boolean needChild){
-        Map<String,String> fieldMap = new HashMap<String,String>();
-        if(!columnNameList.isEmpty()){
-            String module = "" ;
-            String formatType = "0";
-            List<ModuleField> fieldlist = ietFormDatasetService.getFields(module,objid,formatType,needChild);
-            log.error("fieldlist:"+fieldlist.size());
-            for(int i=0;i<fieldlist.size();i++){
-                ModuleField moduleField = fieldlist.get(i);
-                String columnname = moduleField.getColumnName();
-                String fieldid = moduleField.getFieldId();
-                if(columnNameList.contains(columnname)){
-                    fieldMap.put(columnname,fieldid);
-                }
-            }
-        }
-        return fieldMap;
-    }
 
 
 }