#E10-33# 优化自助服务数据获取接口

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

@@ -64,17 +64,13 @@ public class SelfServiceInfoCmd {
 
         try{
             String sql = " select distinct taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and delete_type=0 and tenant_key =?";
-
+            log.error("sql:"+sql);
             List<String> strlist = new ArrayList<>(100);
             strlist.add(employeeId);
             strlist.add(tenant_key);
-
-
             List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
-            Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
-
 
-            log.error("sql:"+sql);
+            Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
             List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
             if(recordList.size()>0){
                 // /api/file/preview?type=redirect&imgFormat=small&fileId=977697615197618177&module=ebuilderform&authModule=ebuilderform&source=form&fieldId=977686869110833154&customParam=%7B%22dataId%22%3A%22977697666574729218%22%7D&refId=977697666574729218&folderId=8120831157448215424
@@ -97,9 +93,12 @@ public class SelfServiceInfoCmd {
     }
 
     public List<Map<String,Object>> getCustomeServiceData(String groupId,String sourceType,String field_id,List<Map<String,Object>> recordList,String employeeId){
+        List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
 
         Map<String,String> optionMap = getCustomServiceTypeName(groupId,sourceType,employeeId);
 
+        log.error("getCustemSelfServiceType-recordList:"+recordList.size());
+
         for(int i=0;i<recordList.size();i++){
             Map<String,Object> recordMap = recordList.get(i);
             String taby = String.valueOf(recordMap.get("taby"));
@@ -109,26 +108,27 @@ public class SelfServiceInfoCmd {
             List<Map<String,Object>> customList = getCustomeServiceDataByType(groupId,sourceType,taby,employeeId);
 
             log.error("getCustemSelfServiceType-tabyName:"+tabyName);
-            log.error("getCustemSelfServiceType-taby:"+taby);
             recordMap.put("menus",customList);
             recordMap.put("name",tabyName);
+            dataList.add(recordMap);
         }
-        return recordList;
+
+        log.error("getCustemSelfServiceType-dataList:"+dataList.size());
+        return dataList;
     }
 
     public List<Map<String,Object>> getCustomeServiceDataByType(String groupId,String sourceType,String value,String employeeId){
-        String sql = " select id,fwmc,fwdz,fwtb,taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and taby=? and delete_type=0 and tenant_key = ? order by ifnull(xssx,0) ";
-        log.info("getSelfServiceData--sql:"+sql);
 
+        List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
+        try{
+            String sql = " select id,fwmc,fwdz,fwtb,taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and taby=? and delete_type=0 and tenant_key = ? order by ifnull(xssx,0) ";
+            log.error("getSelfServiceData--sql:"+sql);
             List<String> strlist = new ArrayList<>(100);
             strlist.add(employeeId);
             strlist.add(value);
             strlist.add(tenant_key);
-
             List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
-
-
             List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
             for(int i=0;i<recordList.size();i++){
                 Map<String,Object> recordMap = recordList.get(i);
@@ -138,8 +138,14 @@ public class SelfServiceInfoCmd {
                     fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small";
                 }
                 recordMap.put("fwtburl",fwtburl);
+
+                dataList.add(recordMap);
             }
-        return recordList;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("getCustomeServiceDataByType-e:"+e);
+        }
+        return dataList;
     }
 
     /***
@@ -149,7 +155,8 @@ public class SelfServiceInfoCmd {
      * @return
      */
     public List<Map<String,Object>> getDefaultServiceData(String groupId,String sourceType,String field_id){
-
+        List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
+        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);
 
@@ -159,15 +166,21 @@ public class SelfServiceInfoCmd {
 
             List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
-
             List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
             for(int i=0;i<recordList.size();i++){
                 Map<String,Object> recordMap = recordList.get(i);
                 String taby = String.valueOf(recordMap.get("taby"));
                 List<Map<String,Object>> defaultList =  getDefaultServiceDataByType(groupId,sourceType,taby);
                 recordMap.put("menus",defaultList);
+
+                dataList.add(recordMap);
             }
-        return recordList;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("getDefaultServiceData-e:"+e);
+        }
+
+        return dataList;
     }
 
     /***
@@ -178,6 +191,9 @@ public class SelfServiceInfoCmd {
      * @return
      */
     public List<Map<String,Object>> getDefaultServiceDataByType(String groupId,String sourceType,String value){
+
+        List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
+        try{
             String sql =" select t.taby,t.fwtb,t.fwmc,t.fwdz " +
                     " from uf_zzfwcsh t \n" +
                     " where t.delete_type=0 \n" +
@@ -203,8 +219,15 @@ public class SelfServiceInfoCmd {
                     fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small";
                 }
                 recordMap.put("fwtburl",fwtburl);
+
+                dataList.add(recordMap);
             }
-        return recordList;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("getDefaultServiceDataByType-e:"+e);
+        }
+
+        return dataList;
     }
 
     /***
@@ -216,16 +239,15 @@ public class SelfServiceInfoCmd {
     public Map<String,String> getCustomServiceTypeName(String groupId,String sourceType,String employeeId){
 
         Map<String,String> optionMap = new HashMap<String,String>();
+
+        try{
             String sql = " select id,tabymmc from uf_zzfwrktaby where qy is not null and ry=? and delete_type=0 and tenant_key = ? order by ifnull(xssx,0) ";
             log.error("getCustomServiceTypeName-sql:"+sql);
-
             List<String> strlist = new ArrayList<>(100);
             strlist.add(employeeId);
             strlist.add(tenant_key);
-
             List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
-
             List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
             for(int i=0;i<recordList.size();i++){
                 Map<String,Object> recordMap = recordList.get(i);
@@ -234,6 +256,9 @@ public class SelfServiceInfoCmd {
                 log.error("getCustomServiceTypeName-value:"+value+" name:"+name);
                 optionMap.put(value,name);
             }
+        }catch (Exception e){
+            log.error("getCustomServiceTypeName-e:"+e);
+        }
         return optionMap;
     }
 
@@ -246,6 +271,9 @@ public class SelfServiceInfoCmd {
      * @return
      */
     public List<Map<String,Object>> getCustomeServiceRecord(String groupId,String sourceType,String employeeId){
+
+        List<Map<String,Object>> dataList = new ArrayList<Map<String,Object>>();
+        try {
             String sql = " select id,fwmc,fwdz,fwtb,taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and delete_type=0 and tenant_key = ? order by djcs desc limit 6";
             log.info("getCustomeServiceRecord--sql:"+sql);
 
@@ -256,7 +284,6 @@ public class SelfServiceInfoCmd {
             List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
 
-
             List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
             for(int i=0;i<recordList.size();i++){
                 Map<String,Object> recordMap = recordList.get(i);
@@ -266,8 +293,14 @@ public class SelfServiceInfoCmd {
                     fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small";
                 }
                 recordMap.put("fwtburl",fwtburl);
+
+                dataList.add(recordMap);
             }
-        return recordList;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("getCustomeServiceRecord-e:"+e);
+        }
+        return dataList;
     }
 
     /**
@@ -325,9 +358,7 @@ public class SelfServiceInfoCmd {
     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";