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

updates

Browse Source
webservice
calyrex 4 months ago
parent c35bd596a1
commit 53c17efc24
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java
Unescape Escape View File

@ -58,7 +58,7 @@ public class OaSrmVenMatExtService extends BaseBean {
} catch (Exception e) {
str[0] = "-1";
str[1] = e.toString();
logger_333d882d.info(String.valueOf("调用SRM供应商货源关系接口开始出错：" + e.toString()));
logger_333d882d.error(String.valueOf("调用SRM供应商货源关系接口开始出错：" + e.toString()));
}
return str;
}
@ -79,8 +79,8 @@ public class OaSrmVenMatExtService extends BaseBean {
} catch (Exception e) {
str[0] = "-1";
str[1] = e.toString();
logger_333d882d.info(String.valueOf(e));
logger_333d882d.info(String.valueOf(requestid + "调用SRM供应商货源关系接口开始出错：" + e.toString()));
logger_333d882d.error(String.valueOf(e));
logger_333d882d.error(String.valueOf(requestid + "调用SRM供应商货源关系接口开始出错：" + e.toString()));
}
return str;
}

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

@ -204,7 +204,7 @@ public class OaSrmVenMatExtCheckAction extends BaseBean implements Action, EsbSe
logger_ac19fc9b.info(String.valueOf(new StringBuilder().append(requestid).append("GY104调用接口校验数据完成").toString()));
}
} catch (Exception e) {
logger_ac19fc9b.info(String.valueOf(new StringBuilder().append(requestid).append("SRM接口返回错误信息：").append(e.toString()).toString()));
logger_ac19fc9b.error(String.valueOf(new StringBuilder().append(requestid).append("SRM接口返回错误信息：").append(e.toString()).toString()));
requestinfo.getRequestManager().setMessageid("error");
requestinfo.getRequestManager().setMessagecontent(e.toString());
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));

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

@ -37,6 +37,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
private static final Logger logger_824c0f2 = LoggerFactory.getLogger(OaWmsReturnAction.class);
public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
logger_824c0f2.info("OaWmsReturnAction start");
Map<String, Object> weaverResultMap = new HashMap<>();
Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
@ -69,6 +70,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
// 获取申请人直接上级
String zjsj = "";
sql = "select (select lastname from employee as hrmresource where id=b.superior) as zjsj from " + tableName + " a,employee b where a.sqr=b.id and a.requestId =" + requestid;
logger_824c0f2.info("sql--" + sql);
String poolname = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(sql, poolname);
@ -92,6 +94,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
str = service.call(param, requestid, cfxt);
logger_824c0f2.info(String.valueOf(requestid + "--OaWmsReturnAction--result:" + str[0] + "-" + str[1]));
sql = "update " + tableName + " set state='" + str[0] + "',message='" + str[1] + "' where requestId=" + requestid;
logger_824c0f2.info("sql--" + sql);
String poolname_et = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(sql, poolname_et);
@ -101,10 +104,11 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
}
} catch (Exception e) {
sql = "update " + tableName + " set state='E',message='" + e.toString() + "' where requestId=" + requestid;
logger_824c0f2.info("sql--"+sql);
String poolname_bm = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(sql, poolname_bm);
logger_824c0f2.info(String.valueOf(requestid + "--OaWmsReturnAction--result:" + e.toString()));
logger_824c0f2.error(String.valueOf(requestid + "--OaWmsReturnAction--result:" + e.toString()));
requestinfo.getRequestManager().setMessagecontent("审批结果返回光导WMS系统出错：" + e.toString());
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
}
@ -112,7 +116,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
} catch (Exception e) {
e.printStackTrace();
logger_824c0f2.error("OaWmsReturnAction e: {}", e.getMessage());
return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager()));
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
}
}

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

@ -37,6 +37,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
}
public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
logger_9c33175e.info("OperateAccountAction start");
Map<String, Object> weaverResultMap = new HashMap<>();
Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
@ -80,6 +81,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
}
String sta = "";
String getStatus = "select status from " + tablename + " where requestId=" + requestId;
logger_9c33175e.info("getStatus" + getStatus);
String poolname_2x = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(getStatus, poolname_2x);
@ -115,6 +117,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
}
}
String sql = "update " + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId;
logger_9c33175e.info("sql" + sql);
String poolname_y8 = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(sql, poolname_y8);
@ -126,13 +129,14 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
String poolname = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
rs.executeSql(errorLog, poolname);
logger_9c33175e.info(String.valueOf(requestId + "开户销户失败：" + e.toString()));
logger_9c33175e.error(String.valueOf(requestId + "开户销户失败：" + e.toString()));
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager()));
}
return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
} catch (Exception e) {
e.printStackTrace();
logger_9c33175e.error("OperateAccountAction e: {}", e.getMessage());
return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager()));
}
}

Write Preview
Loading…
Cancel
Save