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
calyrex 5 months ago
parent 241de0ab12 0c849a2177
commit 9ad0ea5c4f
4 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File

1
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/AccountService.java
Unescape Escape View File

@ -37,6 +37,7 @@ public class AccountService extends BaseBean {
auth.setUsername(configProp.getPo_user());
auth.setPassword(configProp.getPo_password());
logger_18cc50ce.info("sendid == " + sendid);
logger_18cc50ce.info("getPo_user == " + configProp.getPo_user());
logger_18cc50ce.info("getPo_password == " + configProp.getPo_password());

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

@ -31,6 +31,7 @@ public class GetSystemList extends BaseBean {
HttpClient client = new DefaultHttpClient();
// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.getSystemListUrl")).trim();
String url =configProp.getGetSystemListUrl();
logger_a4ce8d9d.info(String.valueOf("GetSystemList start uid == " + uid));
logger_a4ce8d9d.info(String.valueOf("GetSystemList url == " + url));
logger_a4ce8d9d.info(String.valueOf("GetSystemList getUrl_password == " + configProp.getUrl_password()));
post = new HttpPost(url);
@ -41,6 +42,7 @@ public class GetSystemList extends BaseBean {
JSONObject returnJson = new JSONObject();
returnJson.put("doAction", "listSystem");
returnJson.put("uid", uid);
logger_a4ce8d9d.info(String.valueOf("GetSystemList returnJson == " + returnJson));
StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8");
post.setEntity(entity);
HttpResponse response = client.execute(post);

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

@ -66,32 +66,32 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
try {
RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
String sql = "select count(1) sl from ATDPERSONCARDEXVIEW where extype='未刷卡' and SHOULDDATE>='2024-10-01' and SHOULDDATE<='2024-12-30'";
logger.error("sql == " + sql );
boolean count = rs.executeQuery(sql, "hr");
logger.error("count == " + count );
if(rs.next()){
String sl = rs.getString("sl");
logger.error("sl == " + sl );
}
// String sql1 = "select ID,EMPLOYEEID,SHOULDDATE,SHOULDTIME,CARDCOUNT,CARDORDER from ATDPERSONCARDEXVIEW where extype='未刷卡' and SHOULDDATE>='2024-10-01' and SHOULDDATE<='2024-12-30'";
String sql1 = "select top 500 * " +
"from ( " +
"select row_number() over(order by id asc) as rownumber ,ID,EMPLOYEEID,SHOULDDATE,SHOULDTIME,CARDCOUNT,CARDORDER from ATDPERSONCARDEXVIEW where extype='未刷卡' and SHOULDDATE>='2024-10-01' and SHOULDDATE<='2024-12-30' " +
" ) temp_row "+
"where rownumber>1000;";
logger.error("sql1 == " + sql1 );
boolean detail = rs.executeQuery(sql1, "hr");
logger.error("detail == " + detail );
// logger.error("rs.getExecuteResult == " + rs.getExecuteResult() );
if (rs.next()){
logger.error("EMPLOYEEID == " + rs.getString("EMPLOYEEID") );
}
//
// String sql = "select count(1) sl from ATDPERSONCARDEXVIEW where extype='未刷卡' and SHOULDDATE>='2024-10-01' and SHOULDDATE<='2024-12-30'";
// logger.error("sql == " + sql );
// boolean count = rs.executeQuery(sql, "hr");
// logger.error("count == " + count );
// if(rs.next()){
// String sl = rs.getString("sl");
// logger.error("sl == " + sl );
// }
//
//// String sql1 = "select ID,EMPLOYEEID,SHOULDDATE,SHOULDTIME,CARDCOUNT,CARDORDER from ATDPERSONCARDEXVIEW where extype='未刷卡' and SHOULDDATE>='2024-10-01' and SHOULDDATE<='2024-12-30'";
// String sql1 = "select top 500 * " +
// "from ( " +
// "select row_number() over(order by id asc) as rownumber ,ID,EMPLOYEEID,SHOULDDATE,SHOULDTIME,CARDCOUNT,CARDORDER from ATDPERSONCARDEXVIEW where extype='未刷卡' and SHOULDDATE>='2024-10-01' and SHOULDDATE<='2024-12-30' " +
// " ) temp_row "+
// "where rownumber>1000;";
// logger.error("sql1 == " + sql1 );
//
// boolean detail = rs.executeQuery(sql1, "hr");
//
// logger.error("detail == " + detail );
//// logger.error("rs.getExecuteResult == " + rs.getExecuteResult() );
// if (rs.next()){
// logger.error("EMPLOYEEID == " + rs.getString("EMPLOYEEID") );
// }
//
// 测试配置文件读取
// String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("weaver-secondev-htportaloaUrl.accountUrl")).trim();
@ -108,7 +108,7 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
// String sql1 = "select field1 from e10_common.dbo.uf_CustomFlow where field1 = 5 and delete_type = 0";
sql1 = "select id,field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000063120' ";
String sql1 = "select id,field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000063120' ";
// String sql1 = "select field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000000052'";
String poolname = CONN_TYPE.hrm.getType();
@ -127,7 +127,7 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
logger.error("执行rs.executeSql成功");
if (rs.next()) {
String field3 = rs.getString("field3");
String field3 = rs.getString("id");
logger.error("field3 = " + field3);
}
//

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

@ -82,15 +82,18 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
}
}
String sta = "";
String getStatus = "select status from e10_core_business.dbo." + tablename + " where id=" + requestId;
String getStatus = "select id ,status sta from e10_core_business.dbo." + tablename + " where id='" + requestId+"'";
logger_9c33175e.info("getStatus--" + getStatus);
String poolname_2x = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
boolean b = rs.executeSql(getStatus, poolname_2x);
logger_9c33175e.info("b--" + b);
logger_9c33175e.info("b1--" + b);
if (rs.next()) {
sta = Util.null2String(rs.getString("status"));
sta = Util.null2String(rs.getString("sta"));
logger_9c33175e.info("status== " + sta );
}
logger_9c33175e.info("operation--" + operation);
if (!"".equals(operation) && !"S".equals(sta)) {
SI_HTPortalUAMGMT2_OUTServiceStub.UserSyncInfo[] param = new SI_HTPortalUAMGMT2_OUTServiceStub.UserSyncInfo[1];
SI_HTPortalUAMGMT2_OUTServiceStub.UserSyncInfo paramInfo = new SI_HTPortalUAMGMT2_OUTServiceStub.UserSyncInfo();
@ -124,6 +127,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
String poolname_y8 = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
boolean b1 = rs.executeSql(sql, poolname_y8);
logger_9c33175e.info("b2222--" + b1);
if (b1) {
logger_9c33175e.info(String.valueOf(requestId + "----" + gh + "更新状态成功"));
} else {
@ -134,10 +138,11 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl
stat = "E";
message = e.toString();
String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId;
logger_9c33175e.info("errorLog--" + errorLog);
String poolname = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
boolean b = rs.executeSql(errorLog, poolname);
logger_9c33175e.info("b--" + b);
logger_9c33175e.info("Exception b--" + b);
logger_9c33175e.error(requestId + "开户销户失败：" , e);
return WeaResult.fail(500, "执行异常", e);
}

Write Preview
Loading…
Cancel
Save