From 88ba924f0f57216a0bc887020dde24aa5bcb5487 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Fri, 26 Apr 2024 18:03:11 +0800 Subject: [PATCH] =?UTF-8?q?#E10-33#=20=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A9?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcldoor/cmd/SelfServiceInfoCmd.java | 215 ++++++++++-------- 1 file changed, 123 insertions(+), 92 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 9719d6d..3800aa8 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java +++ b/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 strlist = new ArrayList<>(100); strlist.add(employeeId); strlist.add(tenant_key); - - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - - log.error("sql:"+sql); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); List> 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> getCustomeServiceData(String groupId,String sourceType,String field_id,List> recordList,String employeeId){ + List> dataList = new ArrayList>(); Map optionMap = getCustomServiceTypeName(groupId,sourceType,employeeId); + log.error("getCustemSelfServiceType-recordList:"+recordList.size()); + for(int i=0;i recordMap = recordList.get(i); String taby = String.valueOf(recordMap.get("taby")); @@ -109,37 +108,44 @@ public class SelfServiceInfoCmd { List> 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> 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 strlist = new ArrayList<>(100); - strlist.add(employeeId); - strlist.add(value); - strlist.add(tenant_key); - - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List> dataList = new ArrayList>(); + 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 strlist = new ArrayList<>(100); + strlist.add(employeeId); + strlist.add(value); + strlist.add(tenant_key); + List sqlparam = databaseUtils.getSqlParamEntity(strlist); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + for(int i=0;i recordMap = recordList.get(i); + String fwtb = String.valueOf(recordMap.get("fwtb")); + String fwtburl = ""; + if(StringUtils.isNotBlank(fwtb)){ + fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small"; + } + recordMap.put("fwtburl",fwtburl); - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i recordMap = recordList.get(i); - String fwtb = String.valueOf(recordMap.get("fwtb")); - String fwtburl = ""; - if(StringUtils.isNotBlank(fwtb)){ - fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small"; + dataList.add(recordMap); } - recordMap.put("fwtburl",fwtburl); + }catch (Exception e){ + e.printStackTrace(); + log.error("getCustomeServiceDataByType-e:"+e); } - return recordList; + return dataList; } /*** @@ -149,25 +155,32 @@ public class SelfServiceInfoCmd { * @return */ public List> getDefaultServiceData(String groupId,String sourceType,String field_id){ + List> dataList = new ArrayList>(); + 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); - 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); - - List strlist = new ArrayList<>(100); - strlist.add(field_id); - strlist.add(tenant_key); + List strlist = new ArrayList<>(100); + strlist.add(field_id); + strlist.add(tenant_key); - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List sqlparam = databaseUtils.getSqlParamEntity(strlist); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + for(int i=0;i recordMap = recordList.get(i); + String taby = String.valueOf(recordMap.get("taby")); + List> defaultList = getDefaultServiceDataByType(groupId,sourceType,taby); + recordMap.put("menus",defaultList); - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i recordMap = recordList.get(i); - String taby = String.valueOf(recordMap.get("taby")); - List> defaultList = getDefaultServiceDataByType(groupId,sourceType,taby); - recordMap.put("menus",defaultList); + dataList.add(recordMap); + } + }catch (Exception e){ + e.printStackTrace(); + log.error("getDefaultServiceData-e:"+e); } - return recordList; + + return dataList; } /*** @@ -178,33 +191,43 @@ public class SelfServiceInfoCmd { * @return */ public List> getDefaultServiceDataByType(String groupId,String sourceType,String value){ - String sql =" select t.taby,t.fwtb,t.fwmc,t.fwdz " + + + List> dataList = new ArrayList>(); + try{ + String sql =" select t.taby,t.fwtb,t.fwmc,t.fwdz " + " from uf_zzfwcsh t \n" + " where t.delete_type=0 \n" + " and t.taby= ?" + " and t.tenant_key = ?" + " order by ifnull(t.xssx,0) "; - log.error("getSelfServiceData--sql:"+sql); + log.error("getSelfServiceData--sql:"+sql); - List strlist = new ArrayList<>(100); - strlist.add(value); - strlist.add(tenant_key); + List strlist = new ArrayList<>(100); + strlist.add(value); + strlist.add(tenant_key); - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List sqlparam = databaseUtils.getSqlParamEntity(strlist); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i recordMap = recordList.get(i); - String fwtb = String.valueOf(recordMap.get("fwtb")); - String fwtburl = ""; - if(StringUtils.isNotBlank(fwtb)){ - fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small"; + List> recordList = databaseUtils.getDataSourceList(result); + for(int i=0;i recordMap = recordList.get(i); + String fwtb = String.valueOf(recordMap.get("fwtb")); + String fwtburl = ""; + if(StringUtils.isNotBlank(fwtb)){ + 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); } - recordMap.put("fwtburl",fwtburl); + }catch (Exception e){ + e.printStackTrace(); + log.error("getDefaultServiceDataByType-e:"+e); } - return recordList; + + return dataList; } /*** @@ -216,23 +239,25 @@ public class SelfServiceInfoCmd { public Map getCustomServiceTypeName(String groupId,String sourceType,String employeeId){ Map optionMap = new HashMap(); - 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 strlist = new ArrayList<>(100); - strlist.add(employeeId); - strlist.add(tenant_key); - - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i recordMap = recordList.get(i); - String value = String.valueOf(recordMap.get("id")); - String name = String.valueOf(recordMap.get("tabymmc")); - log.error("getCustomServiceTypeName-value:"+value+" name:"+name); - optionMap.put(value,name); + 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 strlist = new ArrayList<>(100); + strlist.add(employeeId); + strlist.add(tenant_key); + List sqlparam = databaseUtils.getSqlParamEntity(strlist); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + for(int i=0;i recordMap = recordList.get(i); + String value = String.valueOf(recordMap.get("id")); + String name = String.valueOf(recordMap.get("tabymmc")); + log.error("getCustomServiceTypeName-value:"+value+" name:"+name); + optionMap.put(value,name); + } + }catch (Exception e){ + log.error("getCustomServiceTypeName-e:"+e); } return optionMap; } @@ -246,28 +271,36 @@ public class SelfServiceInfoCmd { * @return */ public List> getCustomeServiceRecord(String groupId,String sourceType,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 delete_type=0 and tenant_key = ? order by djcs desc limit 6"; - log.info("getCustomeServiceRecord--sql:"+sql); - List strlist = new ArrayList<>(100); - strlist.add(employeeId); - strlist.add(tenant_key); + List> dataList = new ArrayList>(); + 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); - List sqlparam = databaseUtils.getSqlParamEntity(strlist); - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List strlist = new ArrayList<>(100); + strlist.add(employeeId); + strlist.add(tenant_key); + List sqlparam = databaseUtils.getSqlParamEntity(strlist); + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i recordMap = recordList.get(i); - String fwtb = String.valueOf(recordMap.get("fwtb")); - String fwtburl = ""; - if(StringUtils.isNotBlank(fwtb)){ - fwtburl = "/api/file/preview?fileId="+fwtb+"&module=ebuilderform&authModule=ebuilderform&type=imgs&source=form&fieldId="+fwtb+"&imgFormat=small"; + List> recordList = databaseUtils.getDataSourceList(result); + for(int i=0;i recordMap = recordList.get(i); + String fwtb = String.valueOf(recordMap.get("fwtb")); + String fwtburl = ""; + if(StringUtils.isNotBlank(fwtb)){ + 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); } - recordMap.put("fwtburl",fwtburl); + }catch (Exception e){ + e.printStackTrace(); + log.error("getCustomeServiceRecord-e:"+e); } - return recordList; + return dataList; } /** @@ -325,9 +358,7 @@ public class SelfServiceInfoCmd { 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";