shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
shilei 1 year ago
parent 7dd7f35407
commit 694d0227bd
5 changed files with 203 additions and 34 deletions
Show Stats Download Patch File Download Diff File

69
src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java
Unescape Escape View File

@ -443,11 +443,26 @@ public class SelfServiceInfoCmd {
public String updateServiceTabData(String employeeId,String sourceType,String groupId,String uf_zzfwrktaby_qy,List<Map<String,Object>> recordList){ public String updateServiceTabData(String employeeId,String sourceType,String groupId,String uf_zzfwrktaby_qy,List<Map<String,Object>> recordList){
String code = "200" ; String code = "200" ;
try{ try{
String field_ry = "977243460998938628"; // String field_ry = "977243460998938628";
String field_tabymmc = "977680413716267009"; // String field_tabymmc = "977680413716267009";
String field_qy = "977701557798322178"; // String field_qy = "977701557798322178";
String field_xssx = "981394667260444674"; // String field_xssx = "981394667260444674";
String objId = "977243418007322626"; // String objId = "977243418007322626";
String pkey = "uf_zzfwrktaby.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrktaby.tabymmc";
String field_tabymmc = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrktaby.qy";
String field_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrktaby.xssx";
String field_xssx = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrktaby.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
List<EBDataReqDto> insertEbDataReqDtoList = Lists.newArrayList(); List<EBDataReqDto> insertEbDataReqDtoList = Lists.newArrayList();
List<EBDataReqDto> updateEbDataReqDtoList = Lists.newArrayList(); List<EBDataReqDto> updateEbDataReqDtoList = Lists.newArrayList();
@ -558,14 +573,42 @@ public class SelfServiceInfoCmd {
int errcount = 0 ; int errcount = 0 ;
String field_ry = "977242052157390850"; // String field_ry = "977242052157390850";
String field_fwmc = "977686396664430594"; // String field_fwmc = "977686396664430594";
String field_fwdz = "977686396664430595"; // String field_fwdz = "977686396664430595";
String field_fwtb = "977686869110833154"; // String field_fwtb = "977686869110833154";
String field_qy = "977703984547119105"; // String field_qy = "977703984547119105";
String field_xssx = "981394744418861058"; // String field_xssx = "981394744418861058";
String field_taby = "977686869110833157";
String objId = "977240471802363906"; // String field_taby = "977686869110833157";
// String objId = "977240471802363906";
String pkey = "uf_zzfwrkpz.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.fwmc";
String field_fwmc = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.fwdz";
String field_fwdz = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.fwtb";
String field_fwtb = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.qy";
String field_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.xssx";
String field_xssx = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.taby";
String field_taby = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
try{ try{
String sql =" select t.taby,t.fwtb,t.fwmc,t.fwdz " + String sql =" select t.taby,t.fwtb,t.fwmc,t.fwdz " +

109
src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
Unescape Escape View File

@ -8,6 +8,8 @@ import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
import com.weaver.ebuilder.form.client.entity.data.EBDataReqDetailDto; 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.data.EBDataReqDto;
import com.weaver.ebuilder.form.client.entity.obj.Obj;
import com.weaver.ebuilder.form.client.service.emobile.IEtFormDatasetService;
import com.weaver.framework.remote.client.rest.RestClient; import com.weaver.framework.remote.client.rest.RestClient;
import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.mc.api.async.AsyncSystemMessageRest; import com.weaver.mc.api.async.AsyncSystemMessageRest;
@ -35,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.weaver.ebuilder.form.client.entity.field.ModuleField;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -69,6 +71,9 @@ public class HrmSelfHelpController {
@RpcReference @RpcReference
private RemoteBlogInfoService remoteBlogInfoService ; private RemoteBlogInfoService remoteBlogInfoService ;
@RpcReference
private IEtFormDatasetService ietFormDatasetService;
@Autowired @Autowired
private DatabaseUtils databaseUtils; private DatabaseUtils databaseUtils;
@ -1339,9 +1344,18 @@ public class HrmSelfHelpController {
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi8(HttpServletRequest request){ public WeaResult<Object> testSapi8(HttpServletRequest request){
String field_ry = "985460777098248194" ; // String field_ry = "985460777098248194" ;
String field_amount = "985460777098248195"; // String field_amount = "985460777098248195";
String objId = "985460643895541762"; // String objId = "985460643895541762";
String pkey = "uf_nj_cyqltjb.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_cyqltjb.amount";
String field_amount = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_cyqltjb.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
//com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
log.error("testSapi8"); log.error("testSapi8");
@ -1447,10 +1461,18 @@ public class HrmSelfHelpController {
Long cid = employee.getCid(); Long cid = employee.getCid();
long employeeId = employee.getEmployeeId(); long employeeId = employee.getEmployeeId();
// String field_ry = "985461236726857729" ;
// String field_amount = "985461236726857730";
// String objId = "985461167965437954";
String field_ry = "985461236726857729" ; String pkey = "uf_nj_pjmrdlhhsl.ry";
String field_amount = "985461236726857730"; String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String objId = "985461167965437954";
pkey = "uf_nj_pjmrdlhhsl.amount";
String field_amount = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_pjmrdlhhsl.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
Map<String,Object> dataMap = new HashMap<String,Object>(); Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","testSapi9"); dataMap.put("test","testSapi9");
@ -1589,9 +1611,19 @@ public class HrmSelfHelpController {
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi88(HttpServletRequest request){ public WeaResult<Object> testSapi88(HttpServletRequest request){
String field_ry = "985460777098248194" ; // String field_ry = "985460777098248194" ;
String field_amount = "985460777098248195"; // String field_amount = "985460777098248195";
String objId = "985460643895541762"; // String objId = "985460643895541762";
String pkey = "uf_nj_cyqltjb.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_cyqltjb.amount";
String field_amount = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_cyqltjb.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String groupId = "weaver-ebuilder-form-service"; String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC"; String sourceType = "LOGIC";
@ -1670,17 +1702,19 @@ public class HrmSelfHelpController {
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi99(HttpServletRequest request){ public WeaResult<Object> testSapi99(HttpServletRequest request){
//com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData
String groupId = "weaver-ebuilder-form-service"; String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC"; String sourceType = "LOGIC";
SimpleEmployee employee = UserContext.getCurrentUser(); SimpleEmployee employee = UserContext.getCurrentUser();
long employeeId = employee.getEmployeeId(); long employeeId = employee.getEmployeeId();
String pkey = "uf_nj_pjmrdlhhsl.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String field_ry = "985461236726857729" ; pkey = "uf_nj_pjmrdlhhsl.amount";
String field_amount = "985461236726857730"; String field_amount = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String objId = "985461167965437954";
pkey = "uf_nj_pjmrdlhhsl.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
Map<String,Object> dataMap = new HashMap<String,Object>(); Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","testSapi9"); dataMap.put("test","testSapi9");
@ -1793,4 +1827,49 @@ public class HrmSelfHelpController {
return WeaResult.success(dataMap); return WeaResult.success(dataMap);
} }
@GetMapping("/test200")
@WeaPermission(publicPermission = true)
public WeaResult<Object> test200(HttpServletRequest request){
Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","test200");
try {
String pkey = "uf_nj_cyqltjb.appid";
String appid = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
List<Obj> list = ietFormDatasetService.getTables(appid);
dataMap.put("datas",list);
} catch (Exception e) {
e.printStackTrace();
log.error("testSapi8:"+e);
}
return WeaResult.success(dataMap);
}
@GetMapping("/test201")
@WeaPermission(publicPermission = true)
public WeaResult<Object> test201(HttpServletRequest request){
Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","test201");
String columnnames = request.getParameter("columnnames");
String objid = request.getParameter("objid");
try {
if(StringUtils.isNotBlank(objid)){
Long obj_id = Long.parseLong(objid);
List<String> columnNameList = Arrays.asList(columnnames.split(","));
Map<String,String> fieldMap = jucailinPortalUtils.getFieldIdByColumnName(obj_id,columnNameList,false);
dataMap.put("datas",fieldMap);
}
} catch (Exception e) {
e.printStackTrace();
log.error("testSapi8:"+e);
}
return WeaResult.success(dataMap);
}
} }

15
src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java
Unescape Escape View File

@ -44,9 +44,18 @@ public class ChatDayUtils {
try { try {
String field_ry = "985461236726857729" ; // String field_ry = "985461236726857729" ;
String field_amount = "985461236726857730"; // String field_amount = "985461236726857730";
String objId = "985461167965437954"; // String objId = "985461167965437954";
String pkey = "uf_nj_pjmrdlhhsl.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_pjmrdlhhsl.amount";
String field_amount = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_pjmrdlhhsl.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
SimpleEmployee employee = UserContext.getCurrentUser(); SimpleEmployee employee = UserContext.getCurrentUser();

15
src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java
Unescape Escape View File

@ -53,9 +53,18 @@ public class ChatGroupUtils {
try { try {
String field_ry = "985460777098248194" ; // String field_ry = "985460777098248194" ;
String field_amount = "985460777098248195"; // String field_amount = "985460777098248195";
String objId = "985460643895541762"; // String objId = "985460643895541762";
String pkey = "uf_nj_cyqltjb.ry";
String field_ry = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_cyqltjb.amount";
String field_amount = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_nj_cyqltjb.objId";
String objId = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String startDate = "2001-01-01"; String startDate = "2001-01-01";
//设置当前时间 //设置当前时间

29
src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
Unescape Escape View File

@ -6,6 +6,8 @@ import com.weaver.common.hrm.util.HrmCommonUtil;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
import com.weaver.ebuilder.form.client.entity.data.*; import com.weaver.ebuilder.form.client.entity.data.*;
import com.weaver.ebuilder.form.client.entity.field.ModuleField;
import com.weaver.ebuilder.form.client.service.emobile.IEtFormDatasetService;
import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.domain.user.SimpleEmployee;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
@ -42,6 +44,9 @@ public class JucailinPortalUtils {
@RpcReference(group="ebuilderform") @RpcReference(group="ebuilderform")
private RemoteSimpleDataService remoteSimpleDataService; private RemoteSimpleDataService remoteSimpleDataService;
@RpcReference
private IEtFormDatasetService ietFormDatasetService;
public String getUfPropData(String pkey,String tenant_key) { public String getUfPropData(String pkey,String tenant_key) {
String pvalue = "" ; String pvalue = "" ;
String groupId = "weaver-ebuilder-form-service"; String groupId = "weaver-ebuilder-form-service";
@ -731,6 +736,30 @@ public class JucailinPortalUtils {
return returnMap; 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);
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;
}
} }

Write Preview
Loading…
Cancel
Save