diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java index d810a0e..348bd6b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/ChangeWhiteListState.java @@ -34,7 +34,7 @@ public class ChangeWhiteListState { String dm = list.get(i).get("dm"); String sql = ""; if (!"".equals(mc) && mc != null) { - sql = "select * from e10_core_business.dbo.formtable_main_1556 where (mc='" + mc + "' or shxydm='" + dm + "') and bmdzt='0'"; + sql = "select * from e10_core_business.dbo.formtable_main_1716 where (mc='" + mc + "' or shxydm='" + dm + "') and bmdzt='0'"; logger.error(String.valueOf("sql1 = " + sql )); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -82,7 +82,7 @@ public class ChangeWhiteListState { info.setReason(reason); infos.addWhiteListInfos(info); } - String sql_update = "update e10_core_business.dbo.formtable_main_1556 set bmdzt='1' where mc='" + mc + "'"; + String sql_update = "update e10_core_business.dbo.formtable_main_1716 set bmdzt='1' where mc='" + mc + "'"; logger.error(String.valueOf("sql_update = " + sql_update )); boolean b2 = rs.executeSql(sql_update); logger.error(String.valueOf("b2 = " + b2 )); @@ -102,15 +102,23 @@ public class ChangeWhiteListState { public String[] syncState(SI_WhitelistSync_OUTServiceStub.SyncWhiteListService input) throws Exception { String[] result = new String[5]; - String uri = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_WhitelistSync_OUT&interfaceNamespace=http://hengtong.com/OA/WhitelistSync"; +// String uri = "http://sappod.hengtong.com:50000/XISOAPAdapter/MessageServlet?senderParty=&senderService=BS_OA&receiverParty=&receiverService=&interface=SI_WhitelistSync_OUT&interfaceNamespace=http://hengtong.com/OA/WhitelistSync"; + String uri = configProp.getWhiteList(); SI_WhitelistSync_OUTServiceStub stub = new SI_WhitelistSync_OUTServiceStub(uri); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT,300000); stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT,300000); HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); + String user = configProp.getHtsysjcmt_po_user(); + String password = configProp.getHtsysjcmt_po_password(); + logger.error("------- user : " + user); + logger.error("------- password : " + password); + auth.setUsername(user); + auth.setPassword(password); + stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); SI_WhitelistSync_OUTServiceStub.SyncWhiteListServiceResponse response = stub.sI_WhitelistSync_OUT(input); SI_WhitelistSync_OUTServiceStub.ResultInfo resultInfo = response.get_return(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java index 889c40e..ed1e20a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java @@ -92,6 +92,8 @@ public class ConfigProp { //htecmoasync @Value("${isoresulturl}") private String isoresulturl; + @Value("${whiteList}") + private String whiteList; //htemail @@ -223,9 +225,9 @@ public class ConfigProp { private String efsaccount; @Value("${efspassword}") private String efspassword; - @Value("&{weaver-secondev-htsysjcmt-po_user}") + @Value("${weaver-secondev-htsysjcmt-po_user}") private String htsysjcmt_po_user; - @Value("&{weaver-secondev-htsysjcmt-po_password}") + @Value("${weaver-secondev-htsysjcmt-po_password}") private String htsysjcmt_po_password; //htsrmoasync diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java index 6643a77..fef3769 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomJavaCode.java @@ -19,7 +19,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -55,6 +57,19 @@ public class CustomJavaCode extends BaseBean implements Action, EsbServerlessRpc logger.error("start CustomTeAction"); logger.error("params = " + JSON.toJSONString(params)); Map weaverResultMap = new HashMap<>(); + // 获取当前日期和时间 + Date currentDate = new Date(); + + // 格式化日期 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String formattedDate = dateFormat.format(currentDate); + + // 格式化时间 + SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); + String formattedTime = timeFormat.format(currentDate); + + + Long billid = Long.parseLong(String.valueOf(params.getOrDefault("billid", -1))); logger.error("billid = " + billid); @@ -77,8 +92,8 @@ public class CustomJavaCode extends BaseBean implements Action, EsbServerlessRpc String str9 = recordSet.getString("jyyy"); if (!"".equals(str9)) str9 = str9.replace("
", ""); - String str10 = recordSet.getString("modedatacreatedate"); - String str11 = recordSet.getString("modedatacreatetime"); + String str10 =formattedDate; + String str11 = formattedTime; Map hashMap = new HashMap(); hashMap.put("id", k ); hashMap.put("bh", str4); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java index 97a0c82..b60a977 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateSecLevelAndLockStatus.java @@ -42,11 +42,9 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf logger_b15f4fa5.error("htjt_mode_UpdateSecLevelAndLockStatus start param == " + param); - // 构建E9 requestInfo对象参数 - I18nContextUtil.getBean(GetCubeBtnActionParam.class).getCubeBtnActionParam(param); Long billid = Long.parseLong(String.valueOf(param.getOrDefault("billid", -1))); - logger_b15f4fa5.error("billid == "+ billid ); + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus billid == "+ billid ); Map result = new HashMap(); try { @@ -57,6 +55,7 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf if (billid > 0 ) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String sql = "select * from e10_common.dbo.uf_sellevellock_chg where id=" + billid; + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus sql == "+ sql ); String ry = ""; String aqjb = ""; String zhsd = ""; @@ -70,6 +69,7 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf zhsd = "0"; } sql = "update eteams.dbo.employee as hrmresource set seclevel=" + aqjb + ",passwordlock=" + zhsd + " where id=" + ry + ""; + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus update == "+ sql ); boolean execute = rs.execute(sql); logger_b15f4fa5.error("execute == "+ execute ); ResourceComInfo rci = I18nContextUtil.getBean(ResourceComInfo.class);