From 4635be4bbd60a0fb681789d1d8c1df0e61ce979a Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Tue, 14 Jan 2025 17:00:14 +0800 Subject: [PATCH] 80 files update --- .../com/weaver/seconddev/htpoex/msgRecv.java | 32 +++++-------- .../interfaces/easoa/CallEasServices.java | 5 --- .../srmoa/CallSrmVenMatExtsSevices.java | 2 + .../action/AddVenMatExtsToSrmCheckAction.java | 45 +++++++++---------- .../action/EasDoPayControlAction.java | 4 +- .../workflow/action/K3PORequestAction.java | 3 +- .../workflow/action/OperateAccountAction.java | 8 ++-- .../action/OperateEmailAccountAction.java | 13 +++--- .../action/ZOA_FICO_COC_CHECK_ACTION.java | 3 +- 9 files changed, 52 insertions(+), 63 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/htpoex/msgRecv.java b/secondev-history-action/src/main/java/com/weaver/seconddev/htpoex/msgRecv.java index 0cc65eb..0da1ee0 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/htpoex/msgRecv.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/htpoex/msgRecv.java @@ -5,33 +5,23 @@ package com.weaver.seconddev.htpoex; import com.alibaba.fastjson.JSONArray; -//import com.cloudstore.dev.api.bean.MessageBean; -//import com.weaver.base.msgcenter.channel.IMessageReceive; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.rpc.encoding.XMLType; - +import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.openapi.pojo.message.params.MessageVo; import com.weaver.openapi.pojo.message.params.vo.MessageReciver; import com.weaver.seconddev.interfaces.prop.ConfigProp; +import com.weaver.verupgrade.general.BaseBean; +import com.weaver.verupgrade.hrm.resource.ResourceComInfo; import org.apache.axis.client.Call; import org.apache.axis.client.Service; -import com.weaver.common.i18n.tool.util.I18nContextUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import java.lang.*; -import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.weaver.verupgrade.general.BaseBean; -import com.weaver.verupgrade.hrm.resource.ResourceComInfo; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.rpc.encoding.XMLType; +import java.net.URLEncoder; +import java.text.SimpleDateFormat; +import java.util.*; /** * eip消息推送 门户消息推送 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java index 29f8720..882053d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/CallEasServices.java @@ -112,9 +112,6 @@ public class CallEasServices extends BaseBean { /** * 报账单有效性校验 - * @param bzdh[] 源单据号 数组 - * @param lx[] 类型 数组 - * @param money[] 冻结金额 数组 * @return * @throws Exception */ @@ -256,8 +253,6 @@ public class CallEasServices extends BaseBean { /** * 查询冻结状态 - * @param checkType 1:供应商2：报账单 - * @param checkData 供应商编号或报账单号 数组 * @param oprationtype 操作类型：Y冻结、N解冻 * @param companyIds 公司id * @return diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmVenMatExtsSevices.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmVenMatExtsSevices.java index 4040a98..4e651e1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmVenMatExtsSevices.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmVenMatExtsSevices.java @@ -7,10 +7,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.weaver.verupgrade.general.BaseBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * 供应商新货源扩充接口 */ +@Component public class CallSrmVenMatExtsSevices extends BaseBean { @Autowired private ConfigProp configProp; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java index 898094e..7a89cd9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java @@ -1,37 +1,32 @@ package com.weaver.seconddev.interfaces.workflow.action; -import com.weaver.seconddev.interfaces.htjt.util.TransUtil; -import org.apache.commons.lang.StringEscapeUtils; -import com.weaver.seconddev.interfaces.srmoa.CallSrmVenMatExtsSevices; -import com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub; -import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; +import com.weaver.common.base.entity.result.WeaResult; import com.weaver.common.i18n.tool.util.I18nContextUtil; -import java.lang.*; -import java.util.*; -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.HashMap; +import com.weaver.seconddev.interfaces.htjt.util.TransUtil; +import com.weaver.seconddev.interfaces.srmoa.CallSrmVenMatExtsSevices; +import com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub; +import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.verupgrade.conn.RecordSet; import com.weaver.verupgrade.general.BaseBean; import com.weaver.verupgrade.general.Util; import com.weaver.verupgrade.hrm.resource.ResourceComInfo; -import com.weaver.verupgrade.soa.workflow.request.*; -import com.weaver.verupgrade.soa.workflow.request.Property; -import com.weaver.verupgrade.soa.workflow.request.DetailTable; -import com.weaver.verupgrade.soa.workflow.request.Row; -import com.weaver.verupgrade.soa.workflow.request.Cell; import com.weaver.verupgrade.interfaces.workflow.action.Action; +import com.weaver.verupgrade.soa.workflow.request.*; +import com.weaver.verupgrade.workflow.request.RequestManager; +import org.apache.commons.lang.StringEscapeUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; /** * 供应商新货源扩充接口 校验 */ -@org.springframework.stereotype.Service("workflow_action_AddVenMatExtsToSrmCheckAction") +@Service("workflow_action_AddVenMatExtsToSrmCheckAction") public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface { // 对应E9的请求信息对象 @@ -43,7 +38,9 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E private static final Logger logger_81b57400 = LoggerFactory.getLogger(AddVenMatExtsToSrmCheckAction.class); + @Override public WeaResult> execute(Map requestInfoMap) { + logger_81b57400.info("AddVenMatExtsToSrmCheckAction start"); Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); @@ -211,18 +208,18 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E if (!isTat.equals("S")) { request.getRequestManager().setMessageid("error"); request.getRequestManager().setMessagecontent(msg); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, request.getRequestManager())); + return WeaResult.fail(500, "执行失败"+msg, getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, request.getRequestManager())); } } catch (Exception e) { request.getRequestManager().setMessageid("error"); request.getRequestManager().setMessagecontent("SRM接口返回错误信息：" + e.toString()); - logger_81b57400.info(String.valueOf(requestId + "AddVenMatExtsToSrmCheckAction-Request出错: " + e.toString())); + logger_81b57400.error(requestId + "AddVenMatExtsToSrmCheckAction-Request出错: " ,e); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, request.getRequestManager())); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); - logger_81b57400.error("AddVenMatExtsToSrmCheckAction e: {}", e.getMessage()); + logger_81b57400.error("AddVenMatExtsToSrmCheckAction e: {}", e); return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java index b24c120..9830bbc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasDoPayControlAction.java @@ -180,7 +180,7 @@ public class EasDoPayControlAction extends BaseBean implements Action, EsbServer return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); } } catch (Exception e) { - logger_6cdff8ae.info(String.valueOf("error : " + e.getMessage())); + logger_6cdff8ae.info("error : " , e); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent(e.getMessage()); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); @@ -188,7 +188,7 @@ public class EasDoPayControlAction extends BaseBean implements Action, EsbServer return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); - logger_6cdff8ae.error("EasDoPayControlAction e: {}", e.getMessage()); + logger_6cdff8ae.error("EasDoPayControlAction e: {}", e); return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, request.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java index 845e3e1..34209ec 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java @@ -181,6 +181,7 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless } logger_7396c45f.info(String.valueOf("K3PORequestAction--end--" + requestID)); } catch (Exception e) { + logger_7396c45f.error("Exception --" , e); logger_7396c45f.info(String.valueOf("K3Cloud系统接口失败，请联系K3Cloud系统管理员！")); requestInfo.getRequestManager().setMessageid("ERROR"); requestInfo.getRequestManager().setMessagecontent("K3Cloud系统返回错误信息接口失败，请联系K3Cloud系统管理员！"); @@ -189,7 +190,7 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); - logger_7396c45f.error("K3PORequestAction e: {}", e.getMessage()); + logger_7396c45f.error("K3PORequestAction e: {}", e); return WeaResult.success(getResultMapForAction(weaverResultMap, e.toString(), WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager())); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java index 204b8b4..dd099cf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateAccountAction.java @@ -83,7 +83,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } String sta = ""; String getStatus = "select status from e10_core_business.dbo." + tablename + " where id=" + requestId; - logger_9c33175e.info("getStatus" + getStatus); + logger_9c33175e.info("getStatus--" + getStatus); String poolname_2x = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(getStatus, poolname_2x); @@ -120,7 +120,7 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl } } String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; - logger_9c33175e.info("sql" + sql); + logger_9c33175e.info("sql--" + sql); String poolname_y8 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b1 = rs.executeSql(sql, poolname_y8); @@ -139,13 +139,13 @@ public class OperateAccountAction extends BaseBean implements Action, EsbServerl boolean b = rs.executeSql(errorLog, poolname); logger_9c33175e.info("b--" + b); logger_9c33175e.error(requestId + "开户销户失败：" , e); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); + return WeaResult.fail(500, "执行异常", e); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); logger_9c33175e.error("OperateAccountAction e: {}", e); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); + return WeaResult.fail(500, "执行异常", e); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java index d90ce1f..8f84bb8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateEmailAccountAction.java @@ -102,6 +102,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe for (int i = 0; i < properties.length; i++) { String name = properties[i].getName().toUpperCase(); String value = Util.null2String(properties[i].getValue()); + logger_7c6670cc.info(String.valueOf("属性:" + name + "--" + value)); if (name.equals("YHGH")) { yhgh = value; } @@ -109,6 +110,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe yxzh = value.trim(); } if (name.equals("YXLX")) { + logger_7c6670cc.info("value--" + value); if ("0".equals(value)) { yxlx = "@hengtonggroup.com.cn"; sysid = "SYS025"; @@ -131,6 +133,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe emailIP = configProp.getGuangdao(); port = configProp.getGuangdaoport(); } + logger_7c6670cc.info("port--" + port); } if (name.equals("YWLX")) { ywlx = value; @@ -191,7 +194,7 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe if ("E".equals(res[0])) { request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("处理邮箱账号失败：" + res[1]); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); + return WeaResult.fail(500, "执行异常" + res[1]); } } catch (Exception e) { sql = "update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where id =" + requestId; @@ -200,18 +203,18 @@ public class OperateEmailAccountAction extends BaseBean implements Action, EsbSe // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); logger_7c6670cc.info("b--" + b); - logger_7c6670cc.error(String.valueOf(requestId + "处理邮箱账号失败：" + e.toString())); + logger_7c6670cc.error(requestId + "处理邮箱账号失败：" , e); request.getRequestManager().setMessageid("ERROR"); request.getRequestManager().setMessagecontent("处理邮箱账号失败：" + e.toString()); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); + return WeaResult.fail(500, "执行异常", e); } finally { client.close(); } return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager())); } catch (Exception e) { e.printStackTrace(); - logger_7c6670cc.error("OperateEmailAccountAction e: {}", e.getMessage()); - return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestInfoTemp.getRequestManager())); + logger_7c6670cc.error("OperateEmailAccountAction e: {}", e); + return WeaResult.fail(500, "执行异常", e); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CHECK_ACTION.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CHECK_ACTION.java index 825e8be..ae2f7eb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CHECK_ACTION.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CHECK_ACTION.java @@ -15,12 +15,13 @@ import java.util.Map; * @Description: ZOA_FICO_COC_CHECK动作流调用 */ -@org.springframework.stereotype.Service("workflow_action_ZOA_FICO_COC_CHECK_ACTION ") +@org.springframework.stereotype.Service("workflow_action_ZOA_FICO_COC_CHECK_ACTION") @Slf4j public class ZOA_FICO_COC_CHECK_ACTION implements EsbServerlessRpcRemoteInterface { @Autowired private RequestInfo requestInfoTemp; + @Override public WeaResult> execute(Map requestInfoMap) { log.info("ZOA_FICO_COC_CHECK_ACTION execute start"); log.info("ZOA_FICO_COC_CHECK_ACTION execute params : " + requestInfoMap);