diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java index 379f0a3..e33fa21 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java @@ -24,8 +24,8 @@ public class OaSrmVenMatExtService extends BaseBean { String[] str = new String[3]; // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsrmoasync.SrmVenMatExt")).trim(); // TODO custom 无法获取config -// String url = configProp.getSrmVenMatExtnew(); - String url = "http://10.6.6.155:8080/srm/services/OaSrmVenMatExtService"; + String url = configProp.getSrmVenMatExtnew(); +// String url = "http://10.6.6.155:8080/srm/services/OaSrmVenMatExtService"; try { logger_333d882d.info(String.valueOf("调用SRM供应商货源关系接口开始")); SI_GoodsSupplyExpanding_OUTServiceStub stub = new SI_GoodsSupplyExpanding_OUTServiceStub(url); @@ -37,11 +37,12 @@ public class OaSrmVenMatExtService extends BaseBean { // auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim()); // auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim()); // TODO custom 无法获取config -// auth.setUsername(configProp.getPo_user()); -// auth.setPassword(configProp.getPo_password()); + HttpTransportPropertiesImpl.Authenticator auth = new HttpTransportPropertiesImpl.Authenticator(); - auth.setUsername("pouser"); - auth.setPassword("654321"); + auth.setUsername(configProp.getPo_user()); + auth.setPassword(configProp.getPo_password()); +// auth.setUsername("pouser"); +// auth.setPassword("654321"); logger_333d882d.info("auth--" + auth); stub._getServiceClient().getOptions().setProperty(org.apache.axis2.kernel.http.HTTPConstants.AUTHENTICATE,auth); logger_333d882d.info("stub--" + stub); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java index ec87f40..9ad1ee7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CustomTeAction.java @@ -148,7 +148,7 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc // // // //rpc新增建模数据 - // Long uf_CustomFlow_formId = commonDevUtil.getObjId("uf_CustomFlow"); + 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 "; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java index fedef5a..d8464a9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallApproveAction.java @@ -103,7 +103,7 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_85b99b44.info(String.valueOf(requestId + " logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java index 6d3b78b..fb93229 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceApproveAction.java @@ -82,6 +82,7 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es shsj = timetype.format(now); // 流程请求ID requestId = request.getRequestid(); + logger_c6c5cea5.info("requestId--" + requestId); lcbh = requestId; shyj = request.getRequestManager().getRemark(); shr = hr.getResourcename(request.getLastoperator()); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java index e24b34d..0163be8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/RemindForCarAction.java @@ -3,40 +3,29 @@ package com.weaver.seconddev.interfaces.workflow.action; //import com.cloudstore.dev.api.bean.MessageBean; //import com.cloudstore.dev.api.bean.MessageType; //import com.cloudstore.dev.api.util.Util_Message; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import com.alibaba.fastjson.JSONObject; -import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; import com.weaver.mc.api.async.AsyncSystemMessageRest; import com.weaver.mc.api.entity.MessageEvent; import com.weaver.mc.api.entity.MessageModule; import com.weaver.mc.api.entity.SendMessageEntity; import com.weaver.mc.api.entity.UserEntity; -import com.weaver.openapi.pojo.ApiResult; -import com.weaver.openapi.pojo.message.params.MessageVo; -import com.weaver.openapi.pojo.message.params.vo.MessageEntity; -import com.weaver.openapi.pojo.message.params.vo.MessageReciver; -import com.weaver.openapi.pojo.message.params.vo.MessageSender; -import com.weaver.openapi.service.MessageService; import com.weaver.seconddev.interfaces.prop.ConfigProp; -import org.springframework.core.env.Environment; -import java.lang.*; -import java.util.*; +import com.weaver.verupgrade.general.BaseBean; +import com.weaver.verupgrade.general.Util; +import com.weaver.verupgrade.interfaces.workflow.action.Action; +import com.weaver.verupgrade.soa.workflow.request.Property; +import com.weaver.verupgrade.soa.workflow.request.RequestInfo; import com.weaver.verupgrade.workflow.request.RequestManager; -import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; -import com.weaver.common.base.entity.result.WeaResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import com.weaver.verupgrade.soa.workflow.request.RequestInfo; -import java.util.Map; + +import java.util.ArrayList; import java.util.HashMap; -import com.weaver.verupgrade.general.BaseBean; -import com.weaver.verupgrade.general.Util; -import com.weaver.verupgrade.soa.workflow.request.Property; -import com.weaver.verupgrade.interfaces.workflow.action.Action; +import java.util.List; +import java.util.Map; //TODO config @org.springframework.stereotype.Service("workflow_action_RemindForCarAction")