rj
/
ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ht' into ht

Browse Source
webservice
qijirenjian 4 months ago
parent 8ce39d3e40 105b49be95
commit 39f37f704c
4 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File

16
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java
Unescape Escape View File

@ -120,14 +120,14 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
// logger.info("更新 = " + b);
//
//
// //rpc新增建模数据
// Long uf_CustomFlow_formId = commonDevUtil.getObjId("uf_CustomFlow");
// logger.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId);
// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id
// String sql3 = "update e10_common.dbo.uf_CustomFlow set field2 = '添加数据' where id = " + recodId + " and delete_type = 0 ";
// boolean b1 = rs.executeSql(sql3, poolname);
// logger.info("sql3 = " + sql3);
// logger.info("添加 = " + b1);
//rpc新增建模数据
Long uf_CustomFlow_formId = commonDevUtil.getObjId("uf_CustomFlow");
logger.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId);
Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id
String sql3 = "update e10_common.dbo.uf_CustomFlow set field2 = '添加数据' where id = " + recodId + " and delete_type = 0 ";
boolean b1 = rs.executeSql(sql3, poolname);
logger.info("sql3 = " + sql3);
logger.info("添加 = " + b1);
logger.error("stop CustomTeAction");
Map<String, Object> res = new HashMap<>();

4
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java
Unescape Escape View File

@ -93,18 +93,22 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ
if ("E".equals(ret[0])) {
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId;
logger_4dd7c639.info("sql--" + sql);
String poolname_2y = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(sql, poolname_2y);
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
}
logger_4dd7c639.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行结束"));
} catch (Exception exception) {
logger_4dd7c639.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行出错：" + exception.getMessage()));
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId;
logger_4dd7c639.info("sql--" + sql);
String poolname = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(sql, poolname);
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
}
return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
} catch (Exception e) {

8
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateFwInfoAction.java
Unescape Escape View File

@ -59,20 +59,20 @@ public class UpdateFwInfoAction extends BaseBean implements Action, EsbServerles
// 审批状态 1(案件处理)=未通过 3(结案)=通过
String spzt = String.valueOf(map.get("SPZT"));
// 把状态更新到表单建模中
String sql = "update uf_FW01301 set xajzt = " + spzt + " where id = " + ajxx;
String sql = "update uf_FW01301 set xajzt = '" + spzt + "' where id = '" + ajxx+"'";
logger_af68f31d.info(String.valueOf("UpdateFwInfoAction sql:" + sql));
// rs.execute(sql);
// 状态更新成功后 对单条数据进行重构
ModeRightInfo info = I18nContextUtil.getBean(ModeRightInfo.class);
// ModeRightInfo info = I18nContextUtil.getBean(ModeRightInfo.class);
// 创建人ID <= 0时，创建人ID为原来该条数据的创建人
/*创建人ID，表单模块ID，数据ID
TODO 方法参数:0 类型发生变化 e9类型:int e10类型:long
TODO 方法参数:108 类型发生变化 e9类型:int e10类型:long
TODO 方法参数:Integer.parseInt(ajxx) 类型发生变化 e9类型:int e10类型:long
TODO // 创建人字段已废弃 默认是用billid 数据对应的数据创建人*/
info.rebuildModeDataShareByEdit(0, 108, Integer.parseInt(ajxx));
// info.rebuildModeDataShareByEdit(0, 108, Integer.parseInt(ajxx));
} catch (Exception e) {
logger_af68f31d.error(String.valueOf(e.getMessage()));
logger_af68f31d.error("UpdateFwInfoAction e: {}", e.getMessage());
state = "E";
message = e.getMessage();
return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager()));

53
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java
Unescape Escape View File

@ -4,7 +4,12 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.weaver.common.distribution.genid.IdGenerator;
import com.weaver.common.hrm.util.HrmContextUtil;
import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService;
import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.seconddev.interfaces.prop.ConfigProp;
import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil;
import com.weaver.teams.domain.user.SimpleEmployee;
import corp.openapicalls.contract.setapproval.request.PassengerDetail;
import com.weaver.seconddev.interfaces.htjt.util.LogUtil ;
import com.weaver.seconddev.interfaces.htjt.util.WebApi;
@ -65,6 +70,13 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles
@Autowired
private CallDTtripService dTtripService;
@RpcReference(group = "ebuilderform")
private EbFormDataDubboService ebFormDataDubboService;
@Autowired
private CommonDevUtil commonDevUtil;
// @Autowired
// private CallSLServices callServices;
private static final Logger logger_f5224b91 = LoggerFactory.getLogger(ZOA_SL_GWCC_Action.class);
@ -74,7 +86,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles
Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser();
logger_f5224b91.info("----- workflow_action_ZOA_SL_GWCC_Action new -----");
logger_f5224b91.info("requestIdTemp -----"+ requestIdTemp);
@ -768,26 +780,31 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles
String[] result = callTravelApply.call();
sta = result[0];
message = result[1];
String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')";
logger_f5224b91.info(String.valueOf( "sql_log===" + sql_log));
String poolname_05 = CONN_TYPE.workflow.getType();
/* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
generate = IdGenerator.generate();
boolean b1 = rs1.executeSql(sql_log, poolname_05, generate);
logger_f5224b91.info(String.valueOf( "b1===" + b1));
// String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')";
// logger_f5224b91.info(String.valueOf( "sql_log===" + sql_log));
// String poolname_05 = CONN_TYPE.workflow.getType();
// /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
// generate = IdGenerator.generate();
// boolean b1 = rs1.executeSql(sql_log, poolname_05, generate);
// Long uf_CustomFlow_formId = commonDevUtil.getObjId("sync_eas_log");
// logger_f5224b91.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId);
// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id
// String sql_log = "update e10_common.dbo.sync_eas_log set requestId = '"+reid+"',lcbh='"+sourceKey+"',kssj='"+kssj+"',jssj='"+jssj+"',sqrq='"+sqrq+"',ccmdd='"+attribute8+"',gh='"+applyEmpNum+"',name='"+applyerName+"',sxrgh='"+synergeticNumbers+"',sxrxm='"+synergeticNames+"',reason='"+reason+"',title='"+title+"',sqbm='"+attribute4+"',sqdw='"+attribute5+"',status='"+sta+"',message='"+message+"' where id = " + recodId + " and delete_type = 0 ";
// String poolname_05 = CONN_TYPE.workflow.getType();
// boolean b1 = rs.executeSql(sql_log, poolname_05);
// logger_f5224b91.info(String.valueOf( "b1===" + b1));
logger_f5224b91.info(String.valueOf(reid + "同步数据到EAS完成"));
} catch (Exception e) {
message = e.getMessage();
String sql_log = "insert into sync_eas_log(requestId,lcbh,kssj,jssj,sqrq,ccmdd,gh,name,sxrgh,sxrxm,reason,title,sqbm,sqdw,status,message) " + "values('" + reid + "','" + sourceKey + "','" + kssj + "','" + jssj + "','" + sqrq + "','" + attribute8 + "','" + applyEmpNum + "','" + applyerName + "','" + synergeticNumbers + "'" + ",'" + synergeticNames + "','" + reason + "','" + title + "','" + attribute4 + "','" + attribute5 + "','" + sta + "','" + message + "')";
logger_f5224b91.info(String.valueOf( "sql_log===" + sql_log));
String poolname_ni = CONN_TYPE.workflow.getType();
/* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
generate = IdGenerator.generate();
boolean b1 = rs1.executeSql(sql_log, poolname_ni, generate);
logger_f5224b91.info(String.valueOf( "b1===" + b1));
logger_f5224b91.info(String.valueOf(reid + "同步数据到EAS异常:" + e.toString()));
// Long uf_CustomFlow_formId = commonDevUtil.getObjId("sync_eas_log");
// logger_f5224b91.info("uf_CustomFlow_formId = " + uf_CustomFlow_formId);
// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id
// String sql_log = "update e10_common.dbo.sync_eas_log set requestId = '"+reid+"',lcbh='"+sourceKey+"',kssj='"+kssj+"',jssj='"+jssj+"',sqrq='"+sqrq+"',ccmdd='"+attribute8+"',gh='"+applyEmpNum+"',name='"+applyerName+"',sxrgh='"+synergeticNumbers+"',sxrxm='"+synergeticNames+"',reason='"+reason+"',title='"+title+"',sqbm='"+attribute4+"',sqdw='"+attribute5+"',status='"+sta+"',message='"+message+"' where id = " + recodId + " and delete_type = 0 ";
// String poolname_05 = CONN_TYPE.workflow.getType();
// boolean b1 = rs.executeSql(sql_log, poolname_05);
// logger_f5224b91.info(String.valueOf( "b1===" + b1));
logger_f5224b91.info(reid + "同步数据到EAS异常:" ,e);
}
} catch (Exception e) {
logger_f5224b91.info(String.valueOf(reid + "Exception:" + e.toString()));

Write Preview
Loading…
Cancel
Save