diff --git a/.gitignore b/.gitignore index 4c19df7..a372d93 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ /secDevLib/ /secondev-demo-test/ /secondev-history-action/build/ -/gradlew -/gradlew.bat /README.md +/gradlew.bat /settings.gradle +/gradlew diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java index 43e1bae..3e88e04 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java @@ -14,13 +14,7 @@ public class TransUtil { private static final org.slf4j.Logger logger_24a1e280 = LoggerFactory.getLogger(TransUtil.class); - /** - * 根据选择框显示值 获取现在框value - * - * @param tableName - * @param filedname - * @return - */ + // public String getSelectValue(String tableName, String filedname, String selectname) { // RecordSet rs = I18nContextUtil.getBean(RecordSet.class); // String value = ""; @@ -38,6 +32,20 @@ public class TransUtil { // return value; // } + public String getTableName(String wfid,String tenantKey) { + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + String poolname = CONN_TYPE.workflow.getType(); + rs.setTenantKey(tenantKey); + String tableName = ""; + String sql = "select b.TABLE_NAME from e10_core_business.dbo.wfp_relateform a, e10_core_business.dbo.form_table b where a.relatekey =b.FORM_ID and a.workflowid="+wfid+" and a.delete_type = 0 and a.tenant_key = '"+tenantKey+"' and b.delete_type = 0 and b.tenant_key = '"+tenantKey+"'"; + //log.error(sql); + rs.executeSql(sql, poolname); + if (rs.next()) { + tableName = Util.null2String(rs.getString("TABLE_NAME")); + } + return tableName; + } + public String getSelectName(String tableName, String filedname, String selectvalue) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); 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 af41cdd..874de8c 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 @@ -314,5 +314,4 @@ public class ConfigProp { private String carmessage; - } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtsHandlerServiceServiceStub.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtsHandlerServiceServiceStub.java index bf0fad5..b1250a8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtsHandlerServiceServiceStub.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtsHandlerServiceServiceStub.java @@ -2,7 +2,7 @@ * VenMatExtsHandlerServiceServiceStub.java * *

This file was auto-generated from WSDL by the Apache Axis2 version: 1.8.2 Built on : Jul 13, - * 2022 (06:38:03 EDT) + * 2022 (06:38:03 EDT)11 */ package com.weaver.seconddev.interfaces.srmoa; @@ -111,14 +111,14 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client * * @see * com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceService#sRM_OA_VENMATEXTS_RESULT - * @param sRM_OA_VENMATEXTS_RESULT0 + * @param sRM_OA_VENMATEXTS_RESULT */ public com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub .SRM_OA_VENMATEXTS_RESULTResponseE sRM_OA_VENMATEXTS_RESULT( com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub .SRM_OA_VENMATEXTS_RESULTE - sRM_OA_VENMATEXTS_RESULT0) + sRM_OA_VENMATEXTS_RESULT) throws java.rmi.RemoteException { org.apache.axis2.context.MessageContext _messageContext = @@ -143,7 +143,7 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client env = toEnvelope( getFactory(_operationClient.getOptions().getSoapVersionURI()), - sRM_OA_VENMATEXTS_RESULT0, + sRM_OA_VENMATEXTS_RESULT, optimizeContent( new javax.xml.namespace.QName( "http://srm.webservice.elementspeed.com", "sRM_OA_VENMATEXTS_RESULT")), @@ -239,172 +239,6 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client } } - /** - * Auto generated method signature for Asynchronous Invocations - * - * @see - * com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceService#startsRM_OA_VENMATEXTS_RESULT - * @param sRM_OA_VENMATEXTS_RESULT0 - */ - public void startsRM_OA_VENMATEXTS_RESULT( - com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub - .SRM_OA_VENMATEXTS_RESULTE - sRM_OA_VENMATEXTS_RESULT0, - final com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceCallbackHandler - callback) - throws java.rmi.RemoteException { - - org.apache.axis2.client.OperationClient _operationClient = - _serviceClient.createClient(_operations[0].getName()); - _operationClient - .getOptions() - .setAction( - "http://srm.webservice.elementspeed.com/VenMatExtsHandlerService/SRM_OA_VENMATEXTS_RESULT"); - _operationClient.getOptions().setExceptionToBeThrownOnSOAPFault(true); - - addPropertyToOperationClient( - _operationClient, - org.apache.axis2.description.WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR, - "&"); - - // create SOAP envelope with that payload - org.apache.axiom.soap.SOAPEnvelope env = null; - final org.apache.axis2.context.MessageContext _messageContext = - new org.apache.axis2.context.MessageContext(); - - // Style is Doc. - - env = - toEnvelope( - getFactory(_operationClient.getOptions().getSoapVersionURI()), - sRM_OA_VENMATEXTS_RESULT0, - optimizeContent( - new javax.xml.namespace.QName( - "http://srm.webservice.elementspeed.com", "sRM_OA_VENMATEXTS_RESULT")), - new javax.xml.namespace.QName( - "http://srm.webservice.elementspeed.com", "SRM_OA_VENMATEXTS_RESULT")); - - // adding SOAP soap_headers - _serviceClient.addHeadersToEnvelope(env); - // create message context with that soap envelope - _messageContext.setEnvelope(env); - - // add the message context to the operation client - _operationClient.addMessageContext(_messageContext); - - _operationClient.setCallback( - new org.apache.axis2.client.async.AxisCallback() { - public void onMessage(org.apache.axis2.context.MessageContext resultContext) { - try { - org.apache.axiom.soap.SOAPEnvelope resultEnv = resultContext.getEnvelope(); - - java.lang.Object object = - fromOM( - resultEnv.getBody().getFirstElement(), - com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub - .SRM_OA_VENMATEXTS_RESULTResponseE.class); - callback.receiveResultsRM_OA_VENMATEXTS_RESULT( - (com.weaver.seconddev.interfaces.srmoa.VenMatExtsHandlerServiceServiceStub - .SRM_OA_VENMATEXTS_RESULTResponseE) - object); - - } catch (org.apache.axis2.AxisFault e) { - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(e); - } - } - - public void onError(java.lang.Exception error) { - if (error instanceof org.apache.axis2.AxisFault) { - org.apache.axis2.AxisFault f = (org.apache.axis2.AxisFault) error; - org.apache.axiom.om.OMElement faultElt = f.getDetail(); - if (faultElt != null) { - if (faultExceptionNameMap.containsKey( - new org.apache.axis2.client.FaultMapKey( - faultElt.getQName(), "SRM_OA_VENMATEXTS_RESULT"))) { - // make the fault by reflection - try { - java.lang.String exceptionClassName = - faultExceptionClassNameMap.get( - new org.apache.axis2.client.FaultMapKey( - faultElt.getQName(), "SRM_OA_VENMATEXTS_RESULT")); - java.lang.Class exceptionClass = java.lang.Class.forName(exceptionClassName); - java.lang.reflect.Constructor constructor = - exceptionClass.getConstructor(java.lang.String.class); - java.lang.Exception ex = - (java.lang.Exception) constructor.newInstance(f.getMessage()); - // message class - java.lang.String messageClassName = - faultMessageMap.get( - new org.apache.axis2.client.FaultMapKey( - faultElt.getQName(), "SRM_OA_VENMATEXTS_RESULT")); - java.lang.Class messageClass = java.lang.Class.forName(messageClassName); - java.lang.Object messageObject = fromOM(faultElt, messageClass); - java.lang.reflect.Method m = - exceptionClass.getMethod( - "setFaultMessage", new java.lang.Class[] {messageClass}); - m.invoke(ex, new java.lang.Object[] {messageObject}); - - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT( - new java.rmi.RemoteException(ex.getMessage(), ex)); - } catch (java.lang.ClassCastException e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } catch (java.lang.ClassNotFoundException e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } catch (java.lang.NoSuchMethodException e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } catch (java.lang.reflect.InvocationTargetException e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } catch (java.lang.IllegalAccessException e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } catch (java.lang.InstantiationException e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } catch (org.apache.axis2.AxisFault e) { - // we cannot intantiate the class - throw the original Axis fault - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } - } else { - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } - } else { - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(f); - } - } else { - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(error); - } - } - - public void onFault(org.apache.axis2.context.MessageContext faultContext) { - org.apache.axis2.AxisFault fault = - org.apache.axis2.util.Utils.getInboundFaultFromMessageContext(faultContext); - onError(fault); - } - - public void onComplete() { - try { - _messageContext.getTransportOut().getSender().cleanup(_messageContext); - } catch (org.apache.axis2.AxisFault axisFault) { - callback.receiveErrorsRM_OA_VENMATEXTS_RESULT(axisFault); - } - } - }); - - org.apache.axis2.util.CallbackReceiver _callbackReceiver = null; - if (_operations[0].getMessageReceiver() == null - && _operationClient.getOptions().isUseSeparateListener()) { - _callbackReceiver = new org.apache.axis2.util.CallbackReceiver(); - _operations[0].setMessageReceiver(_callbackReceiver); - } - - // execute the operation client - _operationClient.execute(false); - } - private javax.xml.namespace.QName[] opNameArray = null; private boolean optimizeContent(javax.xml.namespace.QName opName) { @@ -1823,6 +1657,72 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client this.localMatLevel = param; } + /** field for OemCategoryCode */ + protected java.lang.String localOemCategoryCode; + + /* This tracker boolean wil be used to detect whether the user called the set method + * for this attribute. It will be used to determine whether to include this field + * in the serialized XML + */ + protected boolean localOemCategoryCodeTracker = false; + + public boolean isOemCategoryCodeSpecified() { + return localOemCategoryCodeTracker; + } + + /** + * Auto generated getter method + * + * @return java.lang.String + */ + public java.lang.String getOemCategoryCode() { + return localOemCategoryCode; + } + + /** + * Auto generated setter method + * + * @param param OemCategoryCode + */ + public void setOemCategoryCode(java.lang.String param) { + localOemCategoryCodeTracker = param != null; + + this.localOemCategoryCode = param; + } + + /** field for OemCategoryName */ + protected java.lang.String localOemCategoryName; + + /* This tracker boolean wil be used to detect whether the user called the set method + * for this attribute. It will be used to determine whether to include this field + * in the serialized XML + */ + protected boolean localOemCategoryNameTracker = false; + + public boolean isOemCategoryNameSpecified() { + return localOemCategoryNameTracker; + } + + /** + * Auto generated getter method + * + * @return java.lang.String + */ + public java.lang.String getOemCategoryName() { + return localOemCategoryName; + } + + /** + * Auto generated setter method + * + * @param param OemCategoryName + */ + public void setOemCategoryName(java.lang.String param) { + localOemCategoryNameTracker = param != null; + + this.localOemCategoryName = param; + } + /** * @param parentQName * @param factory @@ -2019,6 +1919,38 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client xmlWriter.writeEndElement(); } + if (localOemCategoryCodeTracker) { + namespace = ""; + writeStartElement(null, namespace, "oemCategoryCode", xmlWriter); + + if (localOemCategoryCode == null) { + // write the nil attribute + + throw new org.apache.axis2.databinding.ADBException("oemCategoryCode cannot be null!!"); + + } else { + + xmlWriter.writeCharacters(localOemCategoryCode); + } + + xmlWriter.writeEndElement(); + } + if (localOemCategoryNameTracker) { + namespace = ""; + writeStartElement(null, namespace, "oemCategoryName", xmlWriter); + + if (localOemCategoryName == null) { + // write the nil attribute + + throw new org.apache.axis2.databinding.ADBException("oemCategoryName cannot be null!!"); + + } else { + + xmlWriter.writeCharacters(localOemCategoryName); + } + + xmlWriter.writeEndElement(); + } xmlWriter.writeEndElement(); } @@ -2479,6 +2411,54 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); + if (reader.isStartElement() + && new javax.xml.namespace.QName("", "oemCategoryCode").equals(reader.getName())) { + + nillableValue = + reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance", "nil"); + if ("true".equals(nillableValue) || "1".equals(nillableValue)) { + throw new org.apache.axis2.databinding.ADBException( + "The element: " + "oemCategoryCode" + " cannot be null"); + } + + java.lang.String content = reader.getElementText(); + + object.setOemCategoryCode( + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content)); + + reader.next(); + + } // End of if for expected property start element + else { + + } + + while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); + + if (reader.isStartElement() + && new javax.xml.namespace.QName("", "oemCategoryName").equals(reader.getName())) { + + nillableValue = + reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance", "nil"); + if ("true".equals(nillableValue) || "1".equals(nillableValue)) { + throw new org.apache.axis2.databinding.ADBException( + "The element: " + "oemCategoryName" + " cannot be null"); + } + + java.lang.String content = reader.getElementText(); + + object.setOemCategoryName( + org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content)); + + reader.next(); + + } // End of if for expected property start element + else { + + } + + while (!reader.isStartElement() && !reader.isEndElement()) reader.next(); + if (reader.isStartElement()) // 2 - A start element we are not expecting indicates a trailing invalid property diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java index 4d73373..69d0651 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java @@ -178,7 +178,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer logger_336cd654.error(String.valueOf(requestId + " 供应商编码：" + valueq)); } if ("cgzzbm".equals(nameq)) { - // 采购组织编码 + // 采购组织编码 11 itemIn.setPurOrgCode(valueq); logger_336cd654.error(String.valueOf(requestId + " 采购组织编码：" + valueq)); } @@ -216,6 +216,11 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer itemIn.setMatLevel(clfl); logger_336cd654.error(String.valueOf(requestId + " 物料编码/物料号：" + clfl)); } + if ("wlxz".equals(nameq)) { + // 物料组名称 + itemIn.setOemCategoryCode(valueq); + logger_336cd654.error(requestId+" wlxz:"+valueq); + } } item[j] = itemIn; } 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 f3dce7d..8eed592 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 @@ -194,6 +194,10 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E itemIn.setMatLevel(clfl); logger_81b57400.error(String.valueOf(requestId + " 物料编码/物料号：" + clfl)); } + if ("wlxz".equals(nameq)) { + // 物料组名称 11 + itemIn.setOemCategoryCode(valueq); + } } item[j] = itemIn; } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java index 3f6f8d8..7a1abf5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/CarApplyInfoAction.java @@ -79,11 +79,14 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles // 测试环境-102，正式环境-42 String type = "42"; // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim(); - String url = configProp.getPc_url(); + //String url = configProp.getPc_url(); + String url = ""; StringBuilder content = new StringBuilder(); content.append("行程：" + map.get("CFDD") + " 至 " + map.get("MDDD") + "；\r\n"); - String pc_url = "/workflow/request/ViewRequest.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; - String mobile_url = "/mobile/plugin/1/view.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; + String mobile_url = configProp.getHtportaloaUrl_pc_url() +"/mobile/workflow/flowpage/view/"+requestid; + String pc_url =configProp.getHtportaloaUrl_pc_url() +"/sp/workflow/flowpage/fullView/"+ requestid; +// String pc_url = "/workflow/request/ViewRequest.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; +// String mobile_url = "/mobile/plugin/1/view.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0"; String otherids = ""; if ("0".equals(map.get("YCYQ"))) { // otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.YC_WJYQTZR")).trim(); @@ -107,14 +110,14 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles info.put("itemId", itemId); info.put("userId", userid); info.put("title", title); - info.put("url", url + URLEncoder.encode(pc_url)); + info.put("url", pc_url); info.put("type", type); info.put("startDate", startDate); info.put("endDate", endDate); info.put("status", "0"); info.put("priority", "0"); info.put("formName", fromName); - info.put("mobileUrl", url + URLEncoder.encode(mobile_url)); + info.put("mobileUrl",mobile_url); info.put("category", "用车"); info.put("source", "1"); info.put("content", content.toString()); @@ -124,6 +127,7 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles logger_4411f79d.error(requestid + "-CarApplyInfoAction-传值[" + JSON.toJSONString(info) + "]"); logger_4411f79d.error(String.valueOf(requestid + "-CarApplyInfoAction-end-返回值：[" + str[0] + "-" + str[1] + "]")); } catch (Exception e) { + logger_4411f79d.error("E:",e); logger_4411f79d.error(String.valueOf(requestid + "-CarApplyInfoAction-error:" + e.toString())); return WeaResult.fail(500, requestid + "-CarApplyInfoAction-error:" + e, getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); @@ -131,6 +135,7 @@ public class CarApplyInfoAction extends BaseBean implements Action, EsbServerles return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager())); } catch (Exception e) { e.printStackTrace(); + logger_4411f79d.error("E:",e); logger_4411f79d.error("CarApplyInfoAction e: {}", e.getMessage()); return WeaResult.fail(500, "CarApplyInfoAction e: {}"+ e, getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java index 00dbe8f..82d0e7d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java @@ -1,5 +1,13 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.authority.api.enums.role.AuthRoleQueryRule; +import com.weaver.authority.api.enums.role.AuthRoleResourceType; +import com.weaver.authority.api.enums.role.AuthUserRoleQueryRule; +import com.weaver.authority.api.enums.role.ConversionRule; +import com.weaver.authority.api.req.role.BatchAuthUserRoleDetail; +import com.weaver.authority.api.req.role.BatchAuthUserRoleReq; +import com.weaver.authority.api.resp.role.BatchAuthUserRoleRes; +import com.weaver.authority.api.rest.RemoteAuthorityRoleService; import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; @@ -42,7 +50,8 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, @RpcReference(group = "ebuilderform") private EbFormDataDubboService ebFormDataDubboService; - + @RpcReference + private RemoteAuthorityRoleService ras; public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); @@ -58,6 +67,7 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, RecordSet rs = I18nContextUtil.getBean(RecordSet.class); // String tablename = tu.getTableName(workflowid); String roleid = "100502830000001498"; + String fbzd = "xxhzj"; String zjlx1 = ""; String sqdw = ""; String sql = "select * from e10_core_business.dbo." + tablename + " where FORM_DATA_ID = " + dataid; @@ -71,6 +81,7 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, } if ("1".equals(zjlx1)) { roleid = "100502830000001564"; + fbzd = "xxhzjrdgcl"; } String xxhzj = ""; String xxhzjrdgcl = ""; @@ -84,16 +95,45 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, }else if("tejiddakia".equals(tenantKey)){//华海 tablename1 = "hrmsubcompanydefined_11"; } - sql = "SELECT xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgcl FROM (SELECT t1.*, t2.id AS subcomid FROM eteams.dbo." + tablename1 + " t1 LEFT JOIN eteams.dbo.department t2 ON t1.FORM_DATA_ID = t2.formdata AND t2.delete_type = 0 WHERE t1.DELETE_TYPE = 0) HrmSubcompanyDefined WHERE HrmSubcompanyDefined.delete_type = 0 and subcomid = '" + sqdw +"'"; - String poolname_cq = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - logger_750b7a22.error("sql--" + sql); - boolean b3 = rs.executeSql(sql, poolname_cq); - logger_750b7a22.error("b3--" + b3); - if (rs.next()) { + String dfid = ""; + sql = "select xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgcl,b.id as dfid from eteams.dbo.department a,eteams.dbo."+tablename1+" b where a.formdata =b.FORM_DATA_ID and a.id="+sqdw+" and a.delete_type ='0' and a.tenant_key = '"+tenantKey+"' and b.delete_type ='0' and b.tenant_key = '"+tenantKey+"'"; + rs.executeSql(sql,CONN_TYPE.hrm.getType()); + if(rs.next()){ xxhzj = Util.null2String(rs.getString("xxhzj")); xxhzjrdgcl = Util.null2String(rs.getString("xxhzjrdgcl")); + dfid = Util.null2String(rs.getString("dfid")); + } + + String matrix_value_config_id = ""; + sql = "select id as matrix_value_config_id from eteams.dbo.form_field where form_id in(100546070000000100,110546070000000100,120546070000000100) and is_delete=0 and tenant_key ='"+tenantKey+"' and data_key='"+fbzd+"'"; + rs.executeSql(sql,CONN_TYPE.hrm.getType()); + if(rs.next()){ + matrix_value_config_id = com.weaver.common.hrm.util.Util.null2String(rs.getString("matrix_value_config_id")); + } + String matrix_id = ""; + sql = "select id from eteams.dbo.hrm_matrix hm where id in(100524200000000001,110524200000000001,120524200000000001) and tenant_key ='"+tenantKey+"'"; + rs.executeSql(sql,CONN_TYPE.hrm.getType()); + if(rs.next()){ + matrix_id = com.weaver.common.hrm.util.Util.null2String(rs.getString("id")); } +// sql = "SELECT xxhzj AS xxhzj, xxhzjrdgcl AS xxhzjrdgcl FROM (SELECT t1.*, t2.id AS subcomid FROM eteams.dbo." + tablename1 + " t1 LEFT JOIN eteams.dbo.department t2 ON t1.FORM_DATA_ID = t2.formdata AND t2.delete_type = 0 WHERE t1.DELETE_TYPE = 0) HrmSubcompanyDefined WHERE HrmSubcompanyDefined.delete_type = 0 and subcomid = '" + sqdw +"'"; +// String poolname_cq = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// logger_750b7a22.error("sql--" + sql); +// boolean b3 = rs.executeSql(sql, poolname_cq); +// logger_750b7a22.error("b3--" + b3); +// if (rs.next()) { +// xxhzj = Util.null2String(rs.getString("xxhzj")); +// xxhzjrdgcl = Util.null2String(rs.getString("xxhzjrdgcl")); +// } + String admin = tu.getsysadminid(tenantKey); + BatchAuthUserRoleReq batchAuthUserRoleReq = new BatchAuthUserRoleReq(); + batchAuthUserRoleReq.setTenantKey(tenantKey); + batchAuthUserRoleReq.setOperator(Long.valueOf(admin)); + batchAuthUserRoleReq.setConversionRule(ConversionRule.ID); + batchAuthUserRoleReq.setRoleQueryRule(AuthRoleQueryRule.ID); + batchAuthUserRoleReq.setUserRoleQueryRule(AuthUserRoleQueryRule.USER); + List data = new ArrayList<>(); try { DetailTable[] detailtable = request.getDetailTableInfo().getDetailTable(); DetailTable dtq = detailtable[0]; @@ -114,28 +154,19 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, xm = valueq; } } + logger_750b7a22.error("xm:"+xm+" bglx:"+bglx); String str = ""; if (bglx.equals("0")) { str = "新增"; - String poolname_jn = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("select user_id from eteams.dbo.auth_user_role as HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_jn); - logger_750b7a22.error("b--" + b); - if (!rs.next()) { - String poolname_k7 = CONN_TYPE.workflow.getType(); - /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - long generate = IdGenerator.generate(); - rs.executeSql("insert into eteams.dbo.auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate); -// SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); -// Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); -// logger_750b7a22.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); -// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id -// String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + roleid + ",resourceid=" + xm + ",rolelevel=2,resourcetype=1 where id = " + recodId + " and delete_type = 0 "; -// boolean b1 = rs.executeSql(sql3, poolname); -// logger_750b7a22.error("sql3 = " + sql3); -// logger_750b7a22.error("添加 = " + b1); - } + sql = "insert into eteams.dbo.hrm_matrix_value_data(id,create_time,update_time,creator,delete_type,tenant_key,matrix_id,matrix_value_config_id,matrix_data_id,relate_id,sort)" + + "select max(id)+1,GETDATE(),GETDATE(),"+admin+",0,'"+tenantKey+"',"+matrix_id+","+matrix_value_config_id+","+sqdw+","+xm+",0 from eteams.dbo.hrm_matrix_value_data"; + rs.executeUpdate(sql,CONN_TYPE.hrm.getType()); + BatchAuthUserRoleDetail dt = new BatchAuthUserRoleDetail(); + dt.setUser(xm); + dt.setResourceType(AuthRoleResourceType.RESOURCE); + dt.setRole(roleid); + data.add(dt); + batchAuthUserRoleReq.setData(data); if ("0".equals(zjlx1)) { if ("".equals(xxhzj)) { xxhzj = xm; @@ -151,10 +182,10 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, } } else if (bglx.equals("1")) { str = "删除"; - String poolname_8p = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("delete from eteams.dbo.HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_8p); - logger_750b7a22.error("b = " + b); + sql = "update eteams.dbo.auth_user_role set delete_type=1 where role_id = "+roleid+" and delete_type=0 and user_id in("+xm+")"; + rs.executeUpdate(sql, CONN_TYPE.hrm.getType()); + sql = "update hrm_matrix_value_data set delete_type=1 where matrix_id="+matrix_id+" and matrix_data_id="+sqdw+" and matrix_value_config_id="+matrix_value_config_id+" and relate_id ='"+xm+"' and tenant_key ='"+tenantKey+"'"; + rs.executeUpdate(sql,CONN_TYPE.hrm.getType()); if ("0".equals(zjlx1)) { if (("," + xxhzj + ",").indexOf("," + xm + ",") >= 0) { xxhzj = ("," + xxhzj + ",").replace(("," + xm + ","), ","); @@ -177,16 +208,19 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, } logger_750b7a22.error(String.valueOf(requestid + "--ChangeInformationExpertsAction--info--" + str + "信息化专家【" + xm + "】")); } -// sql = "update formdata_detail as HrmSubcompanyDefined set xxhzj='" + xxhzj + "',xxhzjrdgcl='" + xxhzjrdgcl + "' where subcomid =" + sqdw; -// logger_750b7a22.error(String.valueOf(requestid + " sql:" + sql)); -// String poolname_h6 = CONN_TYPE.workflow.getType(); -// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// rs.executeSql(sql, poolname_h6); -// sql = "update Matrixtable_1 set xxhzj='" + xxhzj + "',xxhzjrdgcl='" + xxhzjrdgcl + "' where id =" + sqdw; -// logger_750b7a22.error(String.valueOf(requestid + " sql:" + sql)); -// String poolname_3r = CONN_TYPE.workflow.getType(); -// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 -// rs.executeSql(sql, poolname_3r); + if("0".equals(zjlx1)){ + sql = "update eteams.dbo."+tablename1+" set "+fbzd+"='"+xxhzj+"' where id ="+dfid; + logger_750b7a22.error(requestid+" sql:"+sql); + rs.executeUpdate(sql,CONN_TYPE.hrm.getType()); + }else if("1".equals(zjlx1)){ + sql = "update eteams.dbo."+tablename1+" set "+fbzd+"='"+xxhzjrdgcl+"' where id ="+dfid; + logger_750b7a22.error(requestid+" sql:"+sql); + rs.executeUpdate(sql,CONN_TYPE.hrm.getType()); + } + + WeaResult> result2 =ras.batchCreateUserRole(batchAuthUserRoleReq); + + } catch (Exception e) { logger_750b7a22.error(String.valueOf(e)); logger_750b7a22.error(String.valueOf(requestid + "--ChangeInformationExpertsAction--error--" + e.toString())); 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 b4ecb03..d8d4bfd 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 @@ -107,73 +107,52 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc // RecordSet rs = I18nContextUtil.getBean(RecordSet.class); // String sql1 = "select field1 from e10_common.dbo.uf_CustomFlow where field1 = 5 and delete_type = 0"; -// String tablename = "hrmemployeedefined"; -// if("t6kj9c07jr".equals(tenantKey)){ -// tablename = "hrmemployeedefined"; -// }else if("tttit1yc38".equals(tenantKey)){//光电 -// tablename = "hrmemployeedefined_12"; -// }else if("tejiddakia".equals(tenantKey)){//华海 -// tablename = "hrmemployeedefined_11"; -// } -// String sql1 = "select id,field3 from eteams.dbo." + tablename + " where FORM_DATA_ID= '100005650000063120' "; -//// String sql1 = "select field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000000052'"; -// -// String poolname = CONN_TYPE.hrm.getType(); - -// logger.error("sql1 =" + sql1); -// logger.error("poolname =" + poolname); -// -// try { -// rs.executeSql(sql1, poolname); -// } catch (Exception e) { -// logger.error("rs-------", e); -// logger.error("getExecuteResult =" + rs.getExecuteResult()); -// } - - -// logger.error("执行rs.executeSql成功"); -// -// if (rs.next()) { -// String field3 = rs.getString("id"); -// logger.error("field3 = " + field3); -// } -// // -// // -// // String sql2 = "update e10_common.dbo.uf_CustomFlow set field2 = '修改后数据' where field1 = 2 and delete_type = 0 "; -// // boolean b = rs.executeSql(sql2, poolname); -// // logger.error("更新 = " + b); -// // -// // -// // //rpc新增建模数据 -// Long uf_CustomFlow_formId = commonDevUtil.getObjId("uf_CustomFlow"); -// logger.error("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 "; -// boolean b1 = rs.executeSql(sql3, poolname); -// logger.error("sql3 = " + sql3); -// logger.error("添加 = " + b1); + String tablename = "hrmemployeedefined"; + if("t6kj9c07jr".equals(tenantKey)){ + tablename = "hrmemployeedefined"; + }else if("tttit1yc38".equals(tenantKey)){//光电 + tablename = "hrmemployeedefined_12"; + }else if("tejiddakia".equals(tenantKey)){//华海 + tablename = "hrmemployeedefined_11"; + } + String sql1 = "select id,field3 from eteams.dbo." + tablename + " where FORM_DATA_ID= '100005650000063120' "; +// String sql1 = "select field3 from eteams.dbo.hrmemployeedefined where FORM_DATA_ID= '100005650000000052'"; + String poolname = CONN_TYPE.hrm.getType(); + logger.error("sql1 =" + sql1); + logger.error("poolname =" + poolname); try { - logger.error("程序开始等待两分钟..."); - // 1 分钟等于 60000 毫秒，2 分钟则是 120000 毫秒 - Thread.sleep(120000); - logger.error("两分钟等待结束，程序继续执行。"); - String s = null; - System.out.println(s.equals("2")); - + rs.executeSql(sql1, poolname); } catch (Exception e) { - // 当线程在睡眠过程中被中断时，捕获该异常并输出错误信息 - logger.error("线程在等待过程中被中断: " , e); - // 重新设置中断状态 - Thread.currentThread().interrupt(); - return WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())); - + logger.error("rs-------", e); + logger.error("getExecuteResult =" + rs.getExecuteResult()); } -// remoteAuthorityRoleService.batchDeleteUserRole(); + logger.error("执行rs.executeSql成功"); + + if (rs.next()) { + String field3 = rs.getString("id"); + logger.error("field3 = " + field3); + } + // + // + // String sql2 = "update e10_common.dbo.uf_CustomFlow set field2 = '修改后数据' where field1 = 2 and delete_type = 0 "; + // boolean b = rs.executeSql(sql2, poolname); + // logger.error("更新 = " + b); + // + // + // //rpc新增建模数据 + Long uf_CustomFlow_formId = commonDevUtil.getObjId("uf_CustomFlow"); + logger.error("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 "; + boolean b1 = rs.executeSql(sql3, poolname); + logger.error("sql3 = " + sql3); + logger.error("添加 = " + b1); + logger.error("stop CustomTeAction"); Map res = new HashMap<>(); res.put("status", true); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java index f6f6bbd..445170d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java @@ -78,7 +78,7 @@ public class DeleteSapGuidAction extends BaseBean implements Action, EsbServerle } } if ("0".equals(sqlx) && !"1878".equals(workflowid)) { - guid = xxid.replaceAll("
", "").replaceAll(" ", ""); + guid = xxid.replaceAll("
", "").replaceAll(" ", "").replaceAll("\n", ""); } guid = guid.trim(); if ("".equals(guid)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java index 387ca60..1edecdf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasQuerySourceBoeNumAction.java @@ -86,6 +86,7 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS String[] sfhmdArray = new String[sq.length]; logger_3c7e784f.error(String.valueOf("For循环开始校验")); for (int j = 0; j < sq.length; j++) { + djjeArray[j] = ""; // 指定行 Row rq = sq[j]; // 每行数据再按列存储 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java index b2e0794..bc56001 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java @@ -177,8 +177,9 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles input.setSyncWhiteListInfo(infos); try { String[] result = new String[5]; + String uri = configProp.getWhiteList().trim(); // String uri = "http://10.6.2.35:7001/easws/services/syncWhiteListService?wsdl"; - 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"; SI_WhitelistSync_OUTServiceStub stub = new SI_WhitelistSync_OUTServiceStub(uri); stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE); stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3BuildSupplierAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3BuildSupplierAction.java index 2cc2425..97a0eca 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3BuildSupplierAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3BuildSupplierAction.java @@ -233,6 +233,7 @@ public class K3BuildSupplierAction extends BaseBean implements Action, EsbServer // 银行账号 item.setFBankCode(mDetailMap.get("YXZHGH")); // 银联号 + logger_c748ab09.error("LXHGH:"+mDetailMap.get("LXHGH")+"结束"); item.setFCNAPS(mDetailMap.get("LXHGH")); bankarr[j] = item; } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java index 48db065..95bdcac 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/KeyUserAction.java @@ -1,10 +1,19 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.weaver.authority.api.enums.role.AuthRoleQueryRule; +import com.weaver.authority.api.enums.role.AuthRoleResourceType; +import com.weaver.authority.api.enums.role.AuthUserRoleQueryRule; +import com.weaver.authority.api.enums.role.ConversionRule; +import com.weaver.authority.api.req.role.BatchAuthUserRoleDetail; +import com.weaver.authority.api.req.role.BatchAuthUserRoleReq; +import com.weaver.authority.api.resp.role.BatchAuthUserRoleRes; +import com.weaver.authority.api.rest.RemoteAuthorityRoleService; import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService; import com.weaver.framework.rpc.annotation.RpcReference; +import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.verupgrade.conn.CONN_TYPE; @@ -39,7 +48,8 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR @RpcReference(group = "ebuilderform") private EbFormDataDubboService ebFormDataDubboService; - + @RpcReference + private RemoteAuthorityRoleService ras; public WeaResult> execute(Map requestInfoMap) { Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); @@ -94,6 +104,20 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR logger_52370ec1.error(String.valueOf("得到对应角色ID" + dyjsid)); } } + logger_52370ec1.error("dyjsid"+dyjsid); + if("".equals(dyjsid)){ + return WeaResult.success(); + } + String tenantKey = HrmContextUtil.getCurrentTenantKey(); + TransUtil tu = new TransUtil(); + String admin = tu.getsysadminid(tenantKey); + BatchAuthUserRoleReq batchAuthUserRoleReq = new BatchAuthUserRoleReq(); + batchAuthUserRoleReq.setTenantKey(tenantKey); + batchAuthUserRoleReq.setOperator(Long.valueOf(admin)); + batchAuthUserRoleReq.setConversionRule(ConversionRule.ID); + batchAuthUserRoleReq.setRoleQueryRule(AuthRoleQueryRule.ID); + batchAuthUserRoleReq.setUserRoleQueryRule(AuthUserRoleQueryRule.USER); + List data = new ArrayList<>(); if ("0".equals(type)) { // 新增 logger_52370ec1.error(String.valueOf("系统关键用户变更申请流程======新增用户[" + xgjyh + "]")); @@ -101,67 +125,85 @@ public class KeyUserAction extends BaseBean implements Action, EsbServerlessRpcR String[] array = xgjyh.split(","); if (array != null) { for (int i = 0; i < array.length; i++) { -// String poolname_91 = CONN_TYPE.workflow.getType(); - // String cmd=array[i] + flag + dyjsid + flag + level; - /*rs.executeProc("HrmRoleMembers_Insert", cmd); - TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 - TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ -// long generate = IdGenerator.generate(); -// rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_91,generate); - String poolname = CONN_TYPE.hrm.getType(); - SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); - Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); - logger_52370ec1.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); - Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id - String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + dyjsid + ",resourceid=" + array[i] + ",rolelevel=" + level + ",resourcetype=1 where id = " + recodId + " and delete_type = 0 "; - boolean b1 = rs.executeSql(sql3, poolname); - logger_52370ec1.error("sql3 = " + sql3); - logger_52370ec1.error("添加 = " + b1); + BatchAuthUserRoleDetail dt = new BatchAuthUserRoleDetail(); + dt.setUser(array[i]); + dt.setResourceType(AuthRoleResourceType.RESOURCE); + dt.setRole(dyjsid); + data.add(dt); + batchAuthUserRoleReq.setData(data); +//// String poolname_91 = CONN_TYPE.workflow.getType(); +// // String cmd=array[i] + flag + dyjsid + flag + level; +// /*rs.executeProc("HrmRoleMembers_Insert", cmd); +// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +//// long generate = IdGenerator.generate(); +//// rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_91,generate); +// String poolname = CONN_TYPE.hrm.getType(); +// SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); +// Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); +// logger_52370ec1.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); +// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id +// String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + dyjsid + ",resourceid=" + array[i] + ",rolelevel=" + level + ",resourcetype=1 where id = " + recodId + " and delete_type = 0 "; +// boolean b1 = rs.executeSql(sql3, poolname); +// logger_52370ec1.error("sql3 = " + sql3); +// logger_52370ec1.error("添加 = " + b1); } + WeaResult> result2 =ras.batchCreateUserRole(batchAuthUserRoleReq); } } } else if ("1".equals(type)) { // 变更 logger_52370ec1.error(String.valueOf("系统关键用户变更申请流程======取消用户[" + ygjyh + "]新增用户[" + xgjyh + "]")); if (!"".equals(ygjyh)) { - String sql = "delete from e10_common.dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; - String poolname_6f = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql(sql, poolname_6f); - logger_52370ec1.error("b--"+b); + String sql = "update eteams.dbo.auth_user_role set delete_type=1 where role_id = "+dyjsid+" and delete_type=0 and user_id in("+ygjyh+")"; + rs.executeUpdate(sql, CONN_TYPE.hrm.getType()); +// String sql = "delete from e10_common.dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; +// String poolname_6f = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// boolean b = rs.executeSql(sql, poolname_6f); +// logger_52370ec1.error("b--"+b); } if (!"".equals(xgjyh)) { String[] array = xgjyh.split(","); if (array != null) { for (int i = 0; i < array.length; i++) { -// String poolname_8i = CONN_TYPE.workflow.getType(); -// // String cmd=array[i] + flag + dyjsid + flag + level; -// /*rs.executeProc("HrmRoleMembers_Insert", cmd); -// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 -// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ -// long generate = IdGenerator.generate(); -// rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_8i,generate); - String poolname = CONN_TYPE.hrm.getType(); - SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); - Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); - logger_52370ec1.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); - Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); - String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + dyjsid + ",resourceid=" + array[i] + ",rolelevel=" + level + ",resourcetype=1 where id = " + recodId + " and delete_type = 0 "; - boolean b1 = rs.executeSql(sql3, poolname); - logger_52370ec1.error("sql3 = " + sql3); - logger_52370ec1.error("添加 = " + b1); + BatchAuthUserRoleDetail dt = new BatchAuthUserRoleDetail(); + dt.setUser(array[i]); + dt.setResourceType(AuthRoleResourceType.RESOURCE); + dt.setRole(dyjsid); + data.add(dt); + batchAuthUserRoleReq.setData(data); +//// String poolname_8i = CONN_TYPE.workflow.getType(); +//// // String cmd=array[i] + flag + dyjsid + flag + level; +//// /*rs.executeProc("HrmRoleMembers_Insert", cmd); +//// TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 +//// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ +//// long generate = IdGenerator.generate(); +//// rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + dyjsid + "," + array[i] + "," + level + ",1)", poolname_8i,generate); +// String poolname = CONN_TYPE.hrm.getType(); +// SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); +// Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); +// logger_52370ec1.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); +// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee); +// String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + dyjsid + ",resourceid=" + array[i] + ",rolelevel=" + level + ",resourcetype=1 where id = " + recodId + " and delete_type = 0 "; +// boolean b1 = rs.executeSql(sql3, poolname); +// logger_52370ec1.error("sql3 = " + sql3); +// logger_52370ec1.error("添加 = " + b1); } + WeaResult> result2 =ras.batchCreateUserRole(batchAuthUserRoleReq); } } } else if ("2".equals(type)) { // 取消 logger_52370ec1.error(String.valueOf("系统关键用户变更申请流程======取消用户[" + ygjyh + "]")); if (!"".equals(ygjyh)) { - String sql = "delete from dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; - String poolname = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql(sql, poolname); - logger_52370ec1.error("b--"+b); + String sql = "update eteams.dbo.auth_user_role set delete_type=1 where role_id = "+dyjsid+" and delete_type=0 and user_id in("+ygjyh+")"; + rs.executeUpdate(sql, CONN_TYPE.hrm.getType()); +// String sql = "delete from dbo.HrmRoleMembers where roleid = " + dyjsid + " and resourceid in (" + ygjyh + ")"; +// String poolname = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// boolean b = rs.executeSql(sql, poolname); +// logger_52370ec1.error("b--"+b); } } logger_52370ec1.error(String.valueOf("系统关键用户变更申请成功。。。")); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java index 365b5e6..433e628 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java @@ -161,7 +161,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe int dtcount = 0; String detailTablename3 = commonDevUtil.getDetailTableName(tablename,"3"); - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; logger_9af84826.error("OaSrmVendorAdmitAction sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java index a78f164..c0700e6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java @@ -192,7 +192,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe dlvapplyin.setInspectFlag(xcsh); dlvapplyin.setVendorType(gyslxmc); int dtcount = 0; - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; String poolname_6g = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_6g); @@ -250,7 +250,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe oainputvendor.setShzt("1"); if (val.equals("0")) { int dtcount = 0; - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); @@ -303,7 +303,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe List list = new ArrayList(); StringBuilder sb = new StringBuilder(); int dtcount = 0; - String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; logger_a864d799.error("sql-->" + sql); String poolname_4c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -311,117 +311,78 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe logger_a864d799.error(String.valueOf("b--" + b)); dtcount = rs.getCounts(); logger_a864d799.error(String.valueOf(requestid + " dt2count:" + dtcount)); + sql = "select * from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; + rs.executeSql(sql, poolname_4c); if ( sq != null && sq.length <= 300) { - SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); - VenMatExtResultIn paramInfo = new VenMatExtResultIn(); - VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; - String wlhs = ""; - String flagwl = ""; - int itemnum = 0; - for (int j = 0; j < sq.length; j++) { - // 指定行 - Row rq = sq[j]; - Cell[] cq = rq.getCell(); - VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); - String isexists = "0"; - logger_a864d799.error(String.valueOf(requestid + " wlhs:" + wlhs)); - for (int k = 0; k < cq.length; k++) { - // 指定列 - Cell cq1 = cq[k]; - // 明细字段名称 - String nameq = cq1.getName().toLowerCase(); - // 明细字段的值 - String valueq = Util.null2String(cq1.getValue()); - if ("cgzzbm".equals(nameq)) { - set.add(valueq); - } - if ("wlh".equals(nameq)) { - if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { - logger_a864d799.error(String.valueOf(requestid + " 物料号重复:" + valueq)); - isexists = "1"; - continue; - } - itemIn.setMaterialCode(valueq); - list.add(valueq); - wlhs = wlhs + flagwl + valueq; - flagwl = ","; - } - if ("wlms".equals(nameq)) { - String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); - logger_a864d799.error(String.valueOf("wlms:" + wlms)); - // String wlms_half = full2HalfWidth(wlms); - // writeLog("wlms_half:"+wlms_half); - itemIn.setMaterialName(wlms); - } - if ("xjxzb".equals(nameq)) { - itemIn.setWeight(valueq); - } - if ("clfl".equals(nameq)) { - // String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 - // 测试53290 正式59436 - String clfl = tu.getSelectName(tablename, "clfl", valueq); - itemIn.setMatLevel(clfl); + if (dtcount > 0) { + SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); + VenMatExtResultIn paramInfo = new VenMatExtResultIn(); + VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; + String wlhs = ""; + String flagwl = ""; + int itemnum = 0; + while (rs.next()) { + VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); + String isexists = "0"; + logger_a864d799.error(String.valueOf(requestid + " wlhs:" + wlhs)); + set.add(Util.null2String(rs.getString("cgzzbm"))); + String wlh = Util.null2String(rs.getString("wlh")); + if (("," + wlhs + ",").indexOf("," + wlh + ",") >= 0) { + logger_a864d799.error(String.valueOf(requestid + " 物料号重复:" + wlh)); + isexists = "1"; + continue; } + itemIn.setMaterialCode(wlh); + list.add(wlh); + wlhs = wlhs + flagwl + wlh; + flagwl = ","; + String wlms = Util.null2String(rs.getString("wlms")); + wlms = StringEscapeUtils.unescapeHtml(wlms.trim()); + logger_a864d799.error(String.valueOf("wlms:" + wlms)); + // String wlms_half = full2HalfWidth(wlms); + // writeLog("wlms_half:"+wlms_half); + itemIn.setMaterialName(wlms); + itemIn.setWeight(Util.null2String(rs.getString("xjxzb"))); + String clfl = tu.getSelectName(tablename, "clfl", Util.null2String(rs.getString("clfl"))); + itemIn.setMatLevel(clfl); + item[itemnum] = itemIn; + itemnum++; } - if ("1".equals(isexists)) { - logger_a864d799.error(String.valueOf(requestid + " 物料号重复:跳过")); - continue; + String purOrgCodes=""; + String flag = ""; + Iterator it = set.iterator(); + while(it.hasNext()){ + purOrgCodes = purOrgCodes+flag+it.next(); + flag=";"; } - item[itemnum] = itemIn; - itemnum++; - } - if (list.size() > 0) { - // for(String s:list){ - // boolean flag = wlhset.add(s); - // if(!flag){ - // sb.append("物料号-"+s+"-存在重复；"); - // } - // } - if (sb != null && sb.length() > 0) { - state = "E"; - message = sb.toString(); - logger_a864d799.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message)); - } else { - // if(set.size()==1){ - String purOrgCodes = ""; - String flag = ""; - Iterator it = set.iterator(); - while (it.hasNext()) { - purOrgCodes = purOrgCodes + flag + it.next(); - flag = ";"; - } - logger_a864d799.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes)); - paramInfo.setApplyUser(gh); - paramInfo.setCheckUser(shr); - paramInfo.setCompanyCode(sqdwbm); - paramInfo.setCompanyName(sqdw); - paramInfo.setVendorCode(gysbm); - paramInfo.setVendorName(gysmc); - paramInfo.setHandleType("0"); - paramInfo.setRequestId("GY103/" + requestid); - paramInfo.setStartDate(map.get("SQRQ")); - paramInfo.setEndDate("2099-12-31"); - paramInfo.setPurOrgCode(purOrgCodes); - paramInfo.setItems(item); - paramInfo.setFreezeReason(""); - logger_a864d799.error(String.valueOf(requestid + " resourceType:" + resourceType)); - paramInfo.setResourceType(resourceType); - param.setInputTab(paramInfo); + logger_a864d799.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes)); + paramInfo.setApplyUser(gh); + paramInfo.setCheckUser(shr); + paramInfo.setCompanyCode(sqdwbm); + paramInfo.setCompanyName(sqdw); + paramInfo.setVendorCode(gysbm); + paramInfo.setVendorName(gysmc); + paramInfo.setHandleType("0"); + paramInfo.setRequestId("GY103/" + requestid); + paramInfo.setStartDate(map.get("SQRQ")); + paramInfo.setEndDate("2099-12-31"); + paramInfo.setPurOrgCode(purOrgCodes); + paramInfo.setItems(item); + paramInfo.setFreezeReason(""); + logger_a864d799.error(String.valueOf(requestid + " resourceType:" + resourceType)); + paramInfo.setResourceType(resourceType); + param.setInputTab(paramInfo); // OaSrmVenMatExtService service = new OaSrmVenMatExtService(); - String[] str = service.sendsrm(param, requestid); - if ("1".equals(str[0])) { - state = "S"; - } else { - state = "E"; - } - message = str[1]; - logger_a864d799.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message)); - // }else{ - // state = "E"; - // message = "一次只能申请一个采购组织的"; - // writeLog(requestid+" 用户申请货源关系转正数据不符合要求："+message); - // } + // + String[] str = service.sendsrm(param, requestid); + if ("1".equals(str[0])) { + state = "S"; + } else { + state = "E"; } + message = str[1]; + logger_a864d799.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message)); + } } else { state = "E"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java index a926468..9c7a968 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java @@ -162,7 +162,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer oainputvendor.setSyncErp(Integer.valueOf(sftserp)); } int dtcount = 0; - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; logger_a5e612ac.error("sql-->" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -243,7 +243,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer // 当前明细表的所有数据,按行存储 Row[] sq = dtq.getRow(); int dtcount = 0; - String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; logger_a5e612ac.error("sql-->" + sql); String poolname_uh = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -251,120 +251,80 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer logger_a5e612ac.error(String.valueOf(requestid + "调用查询接口返回：" + b)); dtcount = rs.getCounts(); logger_a5e612ac.error(String.valueOf(requestid + " dt2count:" + dtcount)); + sql = "select * from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename2 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; + rs.executeSql(sql, poolname_uh); if (sq.length <= 300) { - SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); - VenMatExtResultIn paramInfo = new VenMatExtResultIn(); - VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; - String wlhs = ""; - String flagwl = ""; - int itemnum = 0; - for (int j = 0; j < sq.length; j++) { - // 指定行 - Row rq = sq[j]; - Cell[] cq = rq.getCell(); - VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); - String isexists = "0"; - logger_a5e612ac.error(String.valueOf(requestid + " wlhs:" + wlhs)); - for (int k = 0; k < cq.length; k++) { - // 指定列 - Cell cq1 = cq[k]; - // 明细字段名称 - String nameq = cq1.getName().toLowerCase(); - // 明细字段的值 - String valueq = Util.null2String(cq1.getValue()); - if ("cgzzbm".equals(nameq)) { - set.add(valueq); - } - if ("wlh".equals(nameq)) { - if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { - logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:" + valueq)); - isexists = "1"; - continue; - } - itemIn.setMaterialCode(valueq); - list.add(valueq); - wlhs = wlhs + flagwl + valueq; - flagwl = ","; - } - if ("wlms".equals(nameq)) { - // String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); - // itemIn.setMaterialName(wlms); - String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); - logger_a5e612ac.error(String.valueOf("wlms:" + wlms)); - // String wlms_half = full2HalfWidth(wlms); - // writeLog("wlms_half:"+wlms_half); - itemIn.setMaterialName(wlms); - } - if ("xjxzb".equals(nameq)) { - itemIn.setWeight(valueq); - } - if ("clfl".equals(nameq)) { - // String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 - // 测试53290 正式59436 - String clfl = tu.getSelectName(tablename, "clfl", valueq); - itemIn.setMatLevel(clfl); + if (dtcount > 0) { + SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); + VenMatExtResultIn paramInfo = new VenMatExtResultIn(); + VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; + String wlhs = ""; + String flagwl = ""; + int itemnum = 0; + while (rs.next()) { + // 指定行 + VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); + String isexists = "0"; + logger_a5e612ac.error(String.valueOf(requestid + " wlhs:" + wlhs)); + set.add(Util.null2String(rs.getString("cgzzbm"))); + String wlh = Util.null2String(rs.getString("wlh")); + if (("," + wlhs + ",").indexOf("," + wlh + ",") >= 0) { + logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:" + wlh)); + isexists = "1"; + continue; } + itemIn.setMaterialCode(wlh); + list.add(wlh); + wlhs = wlhs + flagwl + wlh; + flagwl = ","; + String wlms = Util.null2String(rs.getString("wlms")); + wlms = StringEscapeUtils.unescapeHtml(wlms.trim()); + logger_a5e612ac.error(String.valueOf("wlms:" + wlms)); + // String wlms_half = full2HalfWidth(wlms); + // writeLog("wlms_half:"+wlms_half); + itemIn.setMaterialName(wlms); + itemIn.setWeight(Util.null2String(rs.getString("xjxzb"))); + String clfl = tu.getSelectName(tablename, "clfl", Util.null2String(rs.getString("clfl"))); + itemIn.setMatLevel(clfl); + item[itemnum] = itemIn; + itemnum++; + } - if ("1".equals(isexists)) { - logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:跳过")); - continue; + logger_a5e612ac.error(String.valueOf(requestid + " item:" + item.length)); + String purOrgCodes = ""; + String flag = ""; + Iterator it = set.iterator(); + while (it.hasNext()) { + purOrgCodes = purOrgCodes + flag + it.next(); + flag = ";"; } - item[itemnum] = itemIn; - itemnum++; - } - if (list.size() > 0) { - // for(String s:list){ - // boolean flag = wlhset.add(s); - // if(!flag){ - // sb.append("物料号-"+s+"-存在重复；"); - // } - // } - if (sb != null && sb.length() > 0) { - state = "E"; - message = sb.toString(); - logger_a5e612ac.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message)); - } else { - // if(set.size()==1){ - String purOrgCodes = ""; - String flag = ""; - Iterator it = set.iterator(); - while (it.hasNext()) { - purOrgCodes = purOrgCodes + flag + it.next(); - flag = ";"; - } - logger_a5e612ac.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes)); - paramInfo.setApplyUser(gh); - paramInfo.setCheckUser(shr); - paramInfo.setCompanyCode(sqdwbm); - paramInfo.setCompanyName(sqdw); - paramInfo.setVendorCode(gysbm); - paramInfo.setVendorName(gysmc); - paramInfo.setHandleType("0"); - paramInfo.setRequestId("GY103/" + requestid); - paramInfo.setStartDate(map.get("SQRQ")); - paramInfo.setEndDate("2099-12-31"); - paramInfo.setPurOrgCode(purOrgCodes); - paramInfo.setItems(item); - paramInfo.setFreezeReason(""); - logger_a5e612ac.error(String.valueOf(requestid + " resourceType:" + resourceType)); - paramInfo.setResourceType(resourceType); - param.setInputTab(paramInfo); + logger_a5e612ac.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes)); + paramInfo.setApplyUser(gh); + paramInfo.setCheckUser(shr); + paramInfo.setCompanyCode(sqdwbm); + paramInfo.setCompanyName(sqdw); + paramInfo.setVendorCode(gysbm); + paramInfo.setVendorName(gysmc); + paramInfo.setHandleType("0"); + paramInfo.setRequestId("GY103/" + requestid); + paramInfo.setStartDate(map.get("SQRQ")); + paramInfo.setEndDate("2099-12-31"); + paramInfo.setPurOrgCode(purOrgCodes); + paramInfo.setItems(item); + paramInfo.setFreezeReason(""); + logger_a5e612ac.error(String.valueOf(requestid + " resourceType:" + resourceType)); + paramInfo.setResourceType(resourceType); + param.setInputTab(paramInfo); // OaSrmVenMatExtService service = new OaSrmVenMatExtService(); - // - String[] str = service.sendsrm(param, requestid); - if ("1".equals(str[0])) { - state = "S"; - } else { - state = "E"; - } - message = str[1]; - logger_a5e612ac.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message)); - // }else{ - // state = "E"; - // message = "一次只能申请一个采购组织的"; - // writeLog(requestid+" 用户申请货源关系转正数据不符合要求："+message); - // } + // + String[] str = service.sendsrm(param, requestid); + if ("1".equals(str[0])) { + state = "S"; + } else { + state = "E"; } + message = str[1]; + logger_a5e612ac.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message)); } } else { state = "E"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java index a4025d8..ade453b 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java @@ -160,7 +160,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer } int dtcount = 0; String detailTablename3 = commonDevUtil.getDetailTableName(tablename,"3"); - String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename3 + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; logger_41a64316.error(String.valueOf("sql-->" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -234,16 +234,18 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable(); if(detailtable.length > 1){ // 指定明细表 + DetailTable dtq = null; if(dtq != null){ dtq = detailtable[1]; } + // 当前明细表的所有数据,按行存储 Row[] sq = null; if(dtq != null){sq = dtq.getRow();} int dtcount = 0; String detailTablename = commonDevUtil.getDetailTableName(tablename,"2"); - String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id=b.form_data_id and a.FORM_DATA_ID = " + dataid; + String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; logger_41a64316.error("sql-->" + sql); String poolname_wk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -251,66 +253,93 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer logger_41a64316.error(String.valueOf("b-->" + b)); dtcount = rs.getCounts(); logger_41a64316.error(String.valueOf(requestid + " dt2count:" + dtcount)); - if (sq != null && sq.length <= 300 && sq.length > 0) { + sql = "select * from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id=b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID = " + dataid; + rs.executeSql(sql, poolname_wk); + if (dtcount > 0) { SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); VenMatExtResultIn paramInfo = new VenMatExtResultIn(); VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; String wlhs = ""; String flagwl = ""; int itemnum = 0; - for (int j = 0; j < sq.length; j++) { - // 指定行 - Row rq = sq[j]; - Cell[] cq = rq.getCell(); + while(rs.next()){ VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); - String isexists = "0"; logger_41a64316.error(String.valueOf(requestid + " wlhs:" + wlhs)); - for (int k = 0; k < cq.length; k++) { - // 指定列 - Cell cq1 = cq[k]; - // 明细字段名称 - String nameq = cq1.getName().toLowerCase(); - // 明细字段的值 - String valueq = Util.null2String(cq1.getValue()); - if ("cgzzbm".equals(nameq)) { - set.add(valueq); - } - if ("wlh".equals(nameq)) { - if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { - logger_41a64316.error(String.valueOf(requestid + " 物料号重复:" + valueq)); - isexists = "1"; - continue; - } - itemIn.setMaterialCode(valueq); - wlhs = wlhs + flagwl + valueq; - flagwl = ","; - } - if ("wlms".equals(nameq)) { - // String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); - // itemIn.setMaterialName(wlms); - String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); - logger_41a64316.error(String.valueOf("wlms:" + wlms)); - // String wlms_half = full2HalfWidth(wlms); - // writeLog("wlms_half:"+wlms_half); - itemIn.setMaterialName(wlms); - } - if ("xjxzb".equals(nameq)) { - itemIn.setWeight(valueq); - } - if ("clfl".equals(nameq)) { - // String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 - // 测试53290 正式59436 - String clfl = tu.getSelectName(tablename, "clfl", valueq); - itemIn.setMatLevel(clfl); - } - } - if ("1".equals(isexists)) { - logger_41a64316.error(String.valueOf(requestid + " 物料号重复:跳过")); + set.add(Util.null2String(rs.getString("cgzzbm"))); + String wlh = Util.null2String(rs.getString("wlh")); + if (("," + wlhs + ",").indexOf("," + wlh + ",") >= 0) { + logger_41a64316.error(String.valueOf(requestid + " 物料号重复:" + wlh)); continue; } + itemIn.setMaterialCode(wlh); + wlhs = wlhs + flagwl + wlh; + flagwl = ","; + String wlms = Util.null2String(rs.getString("wlms")); + wlms = StringEscapeUtils.unescapeHtml(wlms.trim()); + logger_41a64316.error(String.valueOf("wlms:" + wlms)); + // String wlms_half = full2HalfWidth(wlms); + // writeLog("wlms_half:"+wlms_half); + itemIn.setMaterialName(wlms); + itemIn.setWeight(Util.null2String(rs.getString("xjxzb"))); + String clfl = tu.getSelectName(tablename, "clfl", Util.null2String(rs.getString("clfl"))); + itemIn.setMatLevel(clfl); item[itemnum] = itemIn; itemnum++; } + logger_41a64316.error(String.valueOf(requestid + " item:" + item.length)); +// for (int j = 0; j < sq.length; j++) { +// // 指定行 +// Row rq = sq[j]; +// Cell[] cq = rq.getCell(); +// VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); +// String isexists = "0"; +// logger_41a64316.error(String.valueOf(requestid + " wlhs:" + wlhs)); +// for (int k = 0; k < cq.length; k++) { +// // 指定列 +// Cell cq1 = cq[k]; +// // 明细字段名称 +// String nameq = cq1.getName().toLowerCase(); +// // 明细字段的值 +// String valueq = Util.null2String(cq1.getValue()); +// if ("cgzzbm".equals(nameq)) { +// set.add(valueq); +// } +// if ("wlh".equals(nameq)) { +// if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { +// logger_41a64316.error(String.valueOf(requestid + " 物料号重复:" + valueq)); +// isexists = "1"; +// continue; +// } +// itemIn.setMaterialCode(valueq); +// wlhs = wlhs + flagwl + valueq; +// flagwl = ","; +// } +// if ("wlms".equals(nameq)) { +// // String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); +// // itemIn.setMaterialName(wlms); +// String wlms = StringEscapeUtils.unescapeHtml(valueq.trim()); +// logger_41a64316.error(String.valueOf("wlms:" + wlms)); +// // String wlms_half = full2HalfWidth(wlms); +// // writeLog("wlms_half:"+wlms_half); +// itemIn.setMaterialName(wlms); +// } +// if ("xjxzb".equals(nameq)) { +// itemIn.setWeight(valueq); +// } +// if ("clfl".equals(nameq)) { +// // String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 +// // 测试53290 正式59436 +// String clfl = tu.getSelectName(tablename, "clfl", valueq); +// itemIn.setMatLevel(clfl); +// } +// } +// if ("1".equals(isexists)) { +// logger_41a64316.error(String.valueOf(requestid + " 物料号重复:跳过")); +// continue; +// } +// item[itemnum] = itemIn; +// itemnum++; +// } String purOrgCodes = ""; String flag = ""; Iterator it = set.iterator(); 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 1cd9f44..e15f90d 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 @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.Map; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.util.HrmContextUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; import com.weaver.common.base.entity.result.WeaResult; @@ -38,7 +39,7 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf * user 当前用户 * importtype 导入方式(仅在批量导入的接口动作会传输) 1 追加，2覆盖,3更新，获取方式(int)param.get("importtype") * 导入链接中拼接的特殊参数(仅在批量导入的接口动作会传输)，比如a=1，可通过param.get("a")获取参数值 - * 页面链接拼接的参数，比如b=2,可以通过param.get("b")来获取参数 + * 页面链接拼接的参数，比如b=2,可以通过pardam.get("b")来获取参数 * @return */ public WeaResult> execute(Map param) { @@ -46,14 +47,21 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf logger_b15f4fa5.error("htjt_mode_UpdateSecLevelAndLockStatus start param == " + param); Long billid = Long.parseLong(String.valueOf(param.getOrDefault("billid", -1))); logger_b15f4fa5.error("UpdateSecLevelAndLockStatus billid == "+ billid ); - + String tenantKey = HrmContextUtil.getCurrentTenantKey(); Map result = new HashMap(); try { if (billid != null) { - + String tablename = "uf_sellevellock_chg"; if (billid > 0 ) { + if("t6kj9c07jr".equals(tenantKey)){ + tablename = "uf_sellevellock_chg"; + }else if("tttit1yc38".equals(tenantKey)){//光电 + tablename = "ftab_265_tttit1yc38"; + }else if("tejiddakia".equals(tenantKey)){//华海 + tablename = "ftab_265_tejiddakia"; + } RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select * from e10_common.dbo.uf_sellevellock_chg where id=" + billid; + String sql = "select * from e10_common.dbo."+tablename+" where id=" + billid; logger_b15f4fa5.error("UpdateSecLevelAndLockStatus sql == "+ sql ); String ry = ""; String aqjb = ""; @@ -68,75 +76,89 @@ public class UpdateSecLevelAndLockStatus implements EsbServerlessRpcRemoteInterf if ("".equals(zhsd)) { zhsd = "0"; } - sql = "update eteams.dbo.employee set sec_level=" + aqjb + " where id=" + ry + ""; + String job_num = ""; + sql = "select job_num from eteams.dbo.employee where id="+ry; + rs.executeSql(sql); + if(rs.next()){ + job_num = Util.null2String(rs.getString("job_num")); + } + if("".equals(job_num)){ + return WeaResult.fail(500, "变更失败job_num:"+job_num, new HashMap<>() ,false); + } + sql = "update eteams.dbo.employee set sec_level=" + aqjb + " where job_num='"+job_num+"'"; logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatesec_level == "+ sql ); boolean execute = rs.execute(sql); logger_b15f4fa5.error("execute == "+ execute ); - + execute = rs.executeUpdate(sql,"E10JTZH"); + logger_b15f4fa5.error("E10JTZH == "+ execute ); +// execute = rs.executeUpdate(sql,"E10HHZH"); +// logger_b15f4fa5.error("executeHH == "+ execute ); //更新账号锁定记录 - sql = "select id, user_id from eteams.dbo.employee a where a.id = " + ry; - logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatesec_level == "+ sql ); - boolean execute2 = rs.execute(sql); - logger_b15f4fa5.error("execute2 == "+ execute2 ); - String userid = ""; - if(rs.next()){ - userid = rs.getString("user_id"); - } - logger_b15f4fa5.error("userid == "+ userid ); - if(StringUtils.isEmpty(userid)){ - return WeaResult.fail(500, "人员id查询为空"); - } - logger_b15f4fa5.error("zhsd2 == "+ zhsd ); - if(StringUtils.isNotEmpty(zhsd)){ - if(zhsd.equals("0")){ //解锁，删除所有锁定记录 - sql = "update ec_passport.dbo.user_lock_info set delete_type = 1 where user_id = " + userid + " and delete_type = 0 "; - - logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatedelete_type == "+ sql ); - boolean execute1 = rs.execute(sql); - logger_b15f4fa5.error("execute1 == "+ execute1 ); - }else if(!zhsd.equals("0")){//锁定，新增一条数据 - sql = "SELECT COUNT (1) AS sd FROM eteams.dbo.employee a ,ec_passport.dbo.user_lock_info b " + - "WHERE a.id = '" + ry +"' AND a.user_id = b.user_id AND a.delete_type = 0 and b.delete_type = 0 "; - boolean b1 = rs.executeQuery(sql); - if(rs.next()){ - int sd = rs.getInt("sd"); - logger_b15f4fa5.error("sd == "+ sd ); - if(sd > 0 ){ - //有记录 - logger_b15f4fa5.error("该账号已锁定"); - }else{ - - String currentEmployeeId = TenantRpcContext.getCurrentEmployeeId(); - String currentTenantKey = TenantRpcContext.getCurrentTenantKey(); - - Date date = new Date(); - - // 创建 SimpleDateFormat 对象，指定包含毫秒的日期时间格式 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - - // 使用 SimpleDateFormat 的 format 方法将 Date 对象格式化为字符串 - String formattedDateTime = sdf.format(date); - - - Long id = IdGenerator.generate(); - sql = "INSERT INTO ec_passport.dbo.user_lock_info (" + - "id, create_time, update_time, creator, delete_type, " + - "tenant_key, user_id, employee_id, overdue_time, user_status, lock_type" + - ") VALUES ('"+id+"', '"+formattedDateTime +"', '"+formattedDateTime+"', '"+currentEmployeeId+ - "', 0, '"+currentTenantKey +"', " + userid + ", " + userid + - " , '2099-01-01 00:00:00.000', 'normal', 'ACCOUNT_LOCK')"; - - logger_b15f4fa5.error("UpdateSecLevelAndLockStatus insert == "+ sql ); - boolean execute1 = rs.execute(sql); - logger_b15f4fa5.error("execute1 == "+ execute1 ); - - + if("t6kj9c07jr".equals(tenantKey)) { + sql = "select id, user_id from eteams.dbo.employee a where a.id = " + ry; + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatesec_level == " + sql); + boolean execute2 = rs.execute(sql); + logger_b15f4fa5.error("execute2 == " + execute2); + String userid = ""; + if (rs.next()) { + userid = rs.getString("user_id"); + } + logger_b15f4fa5.error("userid == " + userid); + if (StringUtils.isEmpty(userid)) { + return WeaResult.fail(500, "人员id查询为空"); + } + logger_b15f4fa5.error("zhsd2 == " + zhsd); + if (StringUtils.isNotEmpty(zhsd)) { + if (zhsd.equals("0")) { //解锁，删除所有锁定记录 + sql = "update ec_passport.dbo.user_lock_info set delete_type = 1 where user_id = " + userid + " and delete_type = 0 "; + + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus updatedelete_type == " + sql); + boolean execute1 = rs.execute(sql); + logger_b15f4fa5.error("execute1 == " + execute1); + } else if (!zhsd.equals("0")) {//锁定，新增一条数据 + sql = "SELECT COUNT (1) AS sd FROM eteams.dbo.employee a ,ec_passport.dbo.user_lock_info b " + + "WHERE a.id = '" + ry + "' AND a.user_id = b.user_id AND a.delete_type = 0 and b.delete_type = 0 "; + boolean b1 = rs.executeQuery(sql); + if (rs.next()) { + int sd = rs.getInt("sd"); + logger_b15f4fa5.error("sd == " + sd); + if (sd > 0) { + //有记录 + logger_b15f4fa5.error("该账号已锁定"); + } else { + + String currentEmployeeId = TenantRpcContext.getCurrentEmployeeId(); + String currentTenantKey = TenantRpcContext.getCurrentTenantKey(); + + Date date = new Date(); + + // 创建 SimpleDateFormat 对象，指定包含毫秒的日期时间格式 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + + // 使用 SimpleDateFormat 的 format 方法将 Date 对象格式化为字符串 + String formattedDateTime = sdf.format(date); + + + Long id = IdGenerator.generate(); + sql = "INSERT INTO ec_passport.dbo.user_lock_info (" + + "id, create_time, update_time, creator, delete_type, " + + "tenant_key, user_id, employee_id, overdue_time, user_status, lock_type" + + ") VALUES ('" + id + "', '" + formattedDateTime + "', '" + formattedDateTime + "', '" + currentEmployeeId + + "', 0, '" + currentTenantKey + "', " + userid + ", " + userid + + " , '2099-01-01 00:00:00.000', 'normal', 'ACCOUNT_LOCK')"; + + logger_b15f4fa5.error("UpdateSecLevelAndLockStatus insert == " + sql); + boolean execute1 = rs.execute(sql); + logger_b15f4fa5.error("execute1 == " + execute1); + + + } } } - } + } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java index 2bce370..5fe97cf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/UpdateTaskNumber.java @@ -68,7 +68,7 @@ public class UpdateTaskNumber implements Action, EsbServerlessRpcRemoteInterface String dataid = commonDevUtil.getidByrequestid(requestId); String detailTablename = commonDevUtil.getDetailTableName(tablename,"1"); - String sql = "select t.id from e10_core_business.dbo." + detailTablename + " t left join e10_core_business.dbo." + tablename + " a on a.form_data_id = t.form_data_id where a.FORM_DATA_ID = " + dataid+ " order by t.id"; + String sql = "select t.id from e10_core_business.dbo." + detailTablename + " t left join e10_core_business.dbo." + tablename + " a on a.form_data_id = t.form_data_id where a.FORM_DATA_ID = " + dataid+ " and t.is_delete=0 order by t.id"; logger_2c12a616.error(String.valueOf("sql=" + sql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECK.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECK.java index 616fabf..1729276 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECK.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECK.java @@ -5,6 +5,8 @@ import com.sap.conn.jco.JCoFunction; import com.weaver.common.i18n.tool.util.I18nContextUtil; import java.lang.*; import java.util.*; + +import com.weaver.emonitor.util.Util; import com.weaver.verupgrade.workflow.request.RequestManager; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; import com.weaver.common.base.entity.result.WeaResult; @@ -64,9 +66,9 @@ public class ZOA_FI_CONUNIT_REDUNCHECK extends BaseBean implements Action, EsbSe } else { // JCoStructure localJCoStructure = localJCoFunction.getImportParameterList().getStructure("IN"); // 公司代码 - localJCoFunction.getImportParameterList().setValue("BUKRS", paramString[0]); + localJCoFunction.getImportParameterList().setValue("BUKRS", Util.null2String(paramString[0])); // 供应商或债权人的账号 - localJCoFunction.getImportParameterList().setValue("LIFNR", paramString[1]); + localJCoFunction.getImportParameterList().setValue("LIFNR", Util.null2String(paramString[1])); // 客户编号 localJCoFunction.getImportParameterList().setValue("KUNNR", paramString[2]); // 纳税登记证代码 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java index 8da836f..c8d762e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_CONUNIT_REDUNCHECKAction.java @@ -3,6 +3,7 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.lang.*; import java.util.*; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.weaver.verupgrade.workflow.request.RequestManager; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; @@ -46,6 +47,15 @@ public class ZOA_FI_CONUNIT_REDUNCHECKAction extends BaseBean implements Action, // 申请业务 String sqyw = ""; String[] prdetail = new String[6]; + if(lcbs.equals("0") ){//sap113 + prdetail[1] = ""; + prdetail[5] = "1"; + prdetail[2] = ""; + }else{//sap112 + prdetail[2] = ""; + prdetail[5] = "2"; + prdetail[1] = ""; + } // 获取表单主字段信息 Property[] properties = request.getMainTableInfo().getProperty(); logger_7e39b657.error("ZOA_FI_CONUNIT_REDUNCHECKAction mainTableProperties==>"+ JSONObject.toJSONString(properties)); @@ -64,17 +74,11 @@ public class ZOA_FI_CONUNIT_REDUNCHECKAction extends BaseBean implements Action, prdetail[0] = value; } - if(lcbs.equals("0") ){//sap113 - prdetail[1] = ""; - prdetail[5] = "1"; - prdetail[2] = ""; - }else{//sap112 - prdetail[2] = ""; - prdetail[5] = "2"; - prdetail[1] = ""; - } + // 供应商或债权人的账号 + logger_7e39b657.error(name); if (name.equals("GYSDM")) { + logger_7e39b657.error("-------------------:"+value); prdetail[1] = value; prdetail[5] = "1"; prdetail[2] = ""; @@ -94,8 +98,9 @@ public class ZOA_FI_CONUNIT_REDUNCHECKAction extends BaseBean implements Action, prdetail[4] = value; } } - logger_7e39b657.error(String.valueOf("ZOA_FI_CONUNIT_REDUNCHECKAction log----sqyw=" + sqyw)); + logger_7e39b657.error(JSON.toJSONString(prdetail)); + logger_7e39b657.error(String.valueOf("ZOA_FI_CONUNIT_REDUNCHECKAction log----gysdm=" + prdetail[1])); if ("0".equals(sqyw)) { // 申请业务为新增时 查重判断 ZOA_FI_CONUNIT_REDUNCHECK po = new ZOA_FI_CONUNIT_REDUNCHECK(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN.java index cdc7e4d..3d3d8d8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN.java @@ -69,6 +69,7 @@ public class ZOA_FI_VENDOR_MAINTAIN extends BaseBean implements Action, EsbServe // 动作类型 localJCoStructure.setValue("EDIT_FLAG", paramString[0]); // 公司代码 + logger_b8f89678.error("BUKRS",paramString[1]); localJCoStructure.setValue("BUKRS", paramString[1]); // 供应商编号 localJCoStructure.setValue("LIFNR", paramString[2]); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java index b8c9375..2141780 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FI_VENDOR_MAINTAIN_GYSAction.java @@ -1,6 +1,8 @@ package com.weaver.seconddev.interfaces.workflow.action; import java.text.SimpleDateFormat; + +import com.alibaba.fastjson.JSONObject; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; @@ -217,10 +219,13 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action prdetail[0] = edit_flag; String tablename = ""; String wfid = request.getWorkflowid(); - String dataid = commonDevUtil.getidByrequestid(wfid); + String dataid = commonDevUtil.getidByrequestid(reid); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); ZOA_FI_VENDOR_MAINTAIN po = new ZOA_FI_VENDOR_MAINTAIN(); + logger_2da6de30.error("1111111---->"+ JSONObject.toJSONString(prdetail)); + logger_2da6de30.error("1111111---->gsdm"+ prdetail[1]); + String[][] fhz = po.Getexecute(prdetail); String sta = fhz[0][0]; String meg = fhz[0][1].replace("'", "’"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java index c544914..87a5d9d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_JGJ_JgAction.java @@ -1,5 +1,6 @@ package com.weaver.seconddev.interfaces.workflow.action; +import com.alibaba.fastjson.JSON; import com.weaver.seconddev.interfaces.swfa.BillFieldUtil; import java.text.SimpleDateFormat; import java.util.HashMap; @@ -119,7 +120,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E prtype = "ZPR4"; } if ("ZPR4".equals(prtype) || "ZPR3".equals(prtype)) { - // 在建工程-ZPR4 维修-ZPR3 + // 在建工程-ZPR4 维修-ZPR3 11 if ("ZPR4".equals(prtype)) { cgz = "140"; } else { @@ -136,6 +137,13 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E prdetail[j][8] = cgz; // 申请者 prdetail[j][9] = code; + if ("3".equals(jdyj)) { + prdetail[j][13] = "线缆接单"; + } else if ("4".equals(jdyj)) { + prdetail[j][13] = "智能接单"; + }else{ + prdetail[j][13] = "否"; + } // 指定行 Row rq = sq[j]; // 每行数据再按列存储 @@ -188,17 +196,19 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E } } // 是否接单 - if (nameq.equals("SFJD")) { - if ("0".equals(valueq)) { - if ("3".equals(jdyj)) { - prdetail[j][13] = "线缆接单"; - } else if ("4".equals(jdyj)) { - prdetail[j][13] = "智能接单"; + if(!"3".equals(jdyj)&&!"4".equals(jdyj)) { + if (nameq.equals("SFJD")) { + if ("0".equals(valueq)) { +// if ("3".equals(jdyj)) { +// prdetail[j][13] = "线缆接单"; +// } else if ("4".equals(jdyj)) { +// prdetail[j][13] = "智能接单"; +// } else { + prdetail[j][13] = "是"; + //} } else { - prdetail[j][13] = "是"; + prdetail[j][13] = "否"; } - } else { - prdetail[j][13] = "否"; } } if ("ZPR3".equals(prtype)) { @@ -221,6 +231,13 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E prdetail[j][4] = cgz; // 申请者 prdetail[j][5] = code; + if ("3".equals(jdyj)) { + prdetail[j][9] = "线缆接单"; + } else if ("4".equals(jdyj)) { + prdetail[j][9] = "智能接单"; + } else { + prdetail[j][9] = "否"; + } // 指定行 Row rq = sq[j]; // 每行数据再按列存储 @@ -261,17 +278,19 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E } } // 是否接单 - if (nameq.equals("SFJD")) { - if ("0".equals(valueq)) { - if ("3".equals(jdyj)) { - prdetail[j][9] = "线缆接单"; - } else if ("4".equals(jdyj)) { - prdetail[j][9] = "智能接单"; + if(!"3".equals(jdyj)&&!"4".equals(jdyj)) { + if (nameq.equals("SFJD")) { + if ("0".equals(valueq)) { +// if ("3".equals(jdyj)) { +// prdetail[j][9] = "线缆接单"; +// } else if ("4".equals(jdyj)) { +// prdetail[j][9] = "智能接单"; +// } else { + prdetail[j][9] = "是"; + // } } else { - prdetail[j][9] = "是"; + prdetail[j][9] = "否"; } - } else { - prdetail[j][9] = "否"; } } } @@ -283,6 +302,7 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); ZOA_MM_PR_CREATE_JGJ po = new ZOA_MM_PR_CREATE_JGJ(); + logger_56a61d8.error(reid+" param:"+ JSON.toJSONString(prdetail)); String[] fhz = po.Getexecute(prtype, prdetail); String cgsqh = fhz[0]; String sta = fhz[1]; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java index 415b9fa..027f14e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java @@ -140,9 +140,9 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act logger_d591fda6.error(String.valueOf("b--" + b)); logger_d591fda6.error(String.valueOf("ZOA_SD_CREDIT_HANDLE_APPROVALAction-Request: " + requestId + "完成")); if (!sta.equals("S")) { - request.getRequestManager().setMessageid("100001"); - request.getRequestManager().setMessagecontent(meg); - +// request.getRequestManager().setMessageid("100001"); +// request.getRequestManager().setMessagecontent(meg); + return WeaResult.fail(500, "接口调用失败:"+meg, new HashMap<>() ,false); } else { try { CRM_SyncUnFreezeTimesStub.CRM_OA_SyncUnFreezeTimes times = new CRM_SyncUnFreezeTimesStub.CRM_OA_SyncUnFreezeTimes(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java index da215a8..a296251 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java @@ -82,10 +82,12 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles private CallDTtripService dTtripService; private static final Logger logger_5e8d517a = LoggerFactory.getLogger(ZOA_SL_GNCC_Action.class); - // E就是否 是否传商旅 - public String sfcsl = ""; public WeaResult> execute(Map requestInfoMap) { + JSONObject requestParams = JSON.parseObject(JSON.toJSONString(requestInfoMap)); + logger_5e8d517a.error(requestParams.toJSONString()); + String sfcsl = requestParams.getString("sfcsl");//E 是否传商旅不调用商旅 + Map weaverResultMap = new HashMap<>(); Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java index c9db0ea..dce26f5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java @@ -125,8 +125,8 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl if ("4".equals(xxjllx)) { DetailTable[] dt = requestinfo.getDetailTableInfo().getDetailTable(); - if(dt.length > 1){ - DetailTable dtm = dt[1]; + if(dt.length >1 || (dt.length==1&&"formtable_main_464_dt2".equals(dt[0].getTableDBName()))){ + DetailTable dtm = dt[0]; Row[] rows = dtm.getRow(); String[][] param = new String[rows.length][9]; String gsdm = ""; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java index 401d552..96b4dc2 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java @@ -60,8 +60,8 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe } logger_9ad0d62b.error("xxjllx -----"+ xxjllx); DetailTable[] detailtable1 = requestinfo.getDetailTableInfo().getDetailTable(); - logger_9ad0d62b.error("detailtable1 length--"+detailtable1.length+",detailtable1[0].getTableDBName()--"+detailtable1[0].getTableDBName()); if(detailtable1.length >1 || (detailtable1.length==1&&"formtable_main_464_dt2".equals(detailtable1[0].getTableDBName()))){ + logger_9ad0d62b.error("detailtable1 length--"+detailtable1.length+",detailtable1[0].getTableDBName()--"+detailtable1[0].getTableDBName()); DetailTable dtq1 = null; dtq1 = detailtable1[0]; @@ -105,8 +105,8 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe } DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable(); - logger_9ad0d62b.error("detailtable1 length--"+detailtable.length+",detailtable1[0].getTableDBName()--"+detailtable[0].getTableDBName()); if(detailtable.length >1 || (detailtable1.length==1&&"formtable_main_464_dt1".equals(detailtable1[0].getTableDBName()))){ + logger_9ad0d62b.error("detailtable1 length--"+detailtable.length+",detailtable1[0].getTableDBName()--"+detailtable[0].getTableDBName()); DetailTable dtq = null; if(detailtable.length==1) { dtq = detailtable[0]; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY151_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY151_Action.java new file mode 100644 index 0000000..16aa260 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY151_Action.java @@ -0,0 +1,125 @@ +package com.weaver.seconddev.interfaces.workflow.action; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.interfaces.htjt.util.LogUtil; +import com.weaver.seconddev.interfaces.htjt.util.TransUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.verupgrade.conn.CONN_TYPE; +import com.weaver.verupgrade.conn.RecordSet; +import com.weaver.verupgrade.general.Util; +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; + +@Service("workflow_action_ZSRM_PUR_INFO_GY151_Action") +public class ZSRM_PUR_INFO_GY151_Action implements EsbServerlessRpcRemoteInterface { + private final Logger log = LoggerFactory.getLogger(ZSRM_PUR_INFO_GY151_Action.class); + + @Autowired + private LogUtil logUtil; + @Autowired + private CommonDevUtil commonDevUtil; + @Override + public WeaResult> execute(Map params) { + JSONObject requestParams = JSON.parseObject(JSON.toJSONString(params)); + log.error(requestParams.toJSONString()); + String workflowID = requestParams.getString("workflowid");;// 获取工作流程Workflowid的值 + String requestId = requestParams.getString("requestid");;//获取当前流程的requestid + String requestName = requestParams.getString("requestName");;//获取当前流程的requestid + String tenantKey = HrmContextUtil.getCurrentTenantKey(); + TransUtil tu = new TransUtil(); + String tableName = tu.getTableName(workflowID,tenantKey); + log.error("ZSRM_PUR_INFO_GY151_Action requestid:"+requestId); + logUtil.setJklm("ZSRM_PUR_INFO_GY151_Action"); + logUtil.setLx("1"); + logUtil.setBt(requestName); + logUtil.setLcid(requestId); + logUtil.setLclxid(workflowID); + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + String poolname = CONN_TYPE.workflow.getType(); + rs.setTenantKey(tenantKey); + String sfxywhjgxxjl = "";//工号 + String mainid = ""; + String sql = "select a.* from e10_core_business.dbo."+tableName+" a,e10_core_business.dbo.wfc_form_data b where a.FORM_DATA_ID =b.dataid and b.requestid ="+requestId; + rs.executeSql(sql,poolname); + if(rs.next()){ + sfxywhjgxxjl = Util.null2String(rs.getString("sfxywhjgxxjl")); + mainid = Util.null2String(rs.getString("FORM_DATA_ID")); + } + if("0".equals(sfxywhjgxxjl)){ + sql = "select * from e10_core_business.dbo."+commonDevUtil.getDetailTableName(tableName,"2")+" where FORM_DATA_ID="+mainid+" and is_delete =0 and tenant_key='"+tenantKey+"'"; + rs.executeSql(sql,poolname); + int cn=rs.getCounts(); + log.error(requestId+"dt2 count:"+cn); + String[][] str = new String[cn][21]; + int j=0; + while (rs.next()){ + str[j][0] = requestId + "_" + j; + str[j][1] = Util.null2String(rs.getString("cgzz")); + str[j][2] = Util.null2String(rs.getString("cgz")); + str[j][3] = Util.null2String(rs.getString("wl")); + str[j][4] = Util.null2String(rs.getString("gyszhh")); + str[j][5] = Util.null2String(rs.getString("dddw")); + str[j][6] = Util.null2String(rs.getString("jbdw")); + str[j][7] = Util.null2String(rs.getString("jbdwfz")); + str[j][8] = Util.null2String(rs.getString("zsdls")); + str[j][9] = Util.null2String(rs.getString("bzdls")); + str[j][10] = Util.null2String(rs.getString("ytjjhsj")); + str[j][11] = Util.null2String(rs.getString("xsgmsdm")); + str[j][12] = Util.null2String(rs.getString("jlfl")); + str[j][13] = Util.null2String(rs.getString("yxqsrq")).replaceAll("-", ""); + str[j][14] = Util.null2String(rs.getString("yxjzrq")).replaceAll("-", ""); + str[j][15] = Util.null2String(rs.getString("jjg")); + str[j][16] = Util.null2String(rs.getString("jbdw")); + str[j][17] = Util.null2String(rs.getString("gyswlz")); + str[j][18] = ""; + str[j][19] = Util.null2String(rs.getString("hb")); + str[j][20] = requestId; + j++; + } + try { + log.error(requestId+"param:"+JSON.toJSONString(str)); + logUtil.setTscs(JSON.toJSONString(str)); + ZSRM_PUR_INFO info = new ZSRM_PUR_INFO(); + String[] ret = info.Getexecute(str); + logUtil.setFhxx(JSON.toJSONString(ret)); + log.error(requestId + "-[" + ret[0] + "," + ret[1] + "]"); + sql = "update " + tableName + " set state=?,message=? where FORM_DATA_ID = " + mainid; + log.error(requestId+"sql -----"+ sql); + String[] obj=new String[2]; + obj[0]=ret[0]; + obj[1]=ret[1]; +// rs.executeUpdate(sql,obj); +// log.error(JSON.toJSONString(rs.getExecuteResult())); +// if (!"S".equals(ret[0])) { +// logUtil.setJkzt("1"); +// logUtil.insertLog(tenantKey); +// return WeaResult.fail(500, "SAP返回错误信息：" + ret[1], new HashMap<>() ,false); +// } + + } catch (Exception e) { + logUtil.setFhxx("异常信息："+e.getMessage()); + logUtil.setJkzt("2"); + logUtil.insertLog(tenantKey); + log.error(requestId+"e:"+e.getMessage()); + log.error("e",e); + sql = "update " + tableName + " set state='E',message='"+e.toString()+"' where FORM_DATA_ID = " + mainid; + log.error(requestId+"sql -----"+ sql); + rs.executeUpdate(sql); +// return WeaResult.fail(500, "调用SAP接口校验数据出错："+e.getMessage(), new HashMap<>() ,false); + } + } + return WeaResult.success(); + } + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY151_CheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY151_CheckAction.java new file mode 100644 index 0000000..5bb2de9 --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY151_CheckAction.java @@ -0,0 +1,119 @@ +package com.weaver.seconddev.interfaces.workflow.action; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.common.hrm.util.HrmContextUtil; +import com.weaver.common.i18n.tool.util.I18nContextUtil; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.interfaces.htjt.util.LogUtil; +import com.weaver.seconddev.interfaces.htjt.util.TransUtil; +import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil; +import com.weaver.verupgrade.conn.CONN_TYPE; +import com.weaver.verupgrade.conn.RecordSet; +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.*; +import com.weaver.verupgrade.workflow.request.RequestManager; +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; + +@Service("workflow_action_ZSRM_PUR_INFO_GY151_CheckAction") +public class ZSRM_PUR_INFO_GY151_CheckAction implements EsbServerlessRpcRemoteInterface { + private final Logger log = LoggerFactory.getLogger(ZSRM_PUR_INFO_GY151_CheckAction.class); + + @Autowired + private LogUtil logUtil; + @Autowired + private CommonDevUtil commonDevUtil; + @Override + public WeaResult> execute(Map params) { + JSONObject requestParams = JSON.parseObject(JSON.toJSONString(params)); + log.error(requestParams.toJSONString()); + String workflowID = requestParams.getString("workflowid");;// 获取工作流程Workflowid的值 + String requestId = requestParams.getString("requestid");;//获取当前流程的requestid + String requestName = requestParams.getString("requestName");;//获取当前流程的requestid + String tenantKey = HrmContextUtil.getCurrentTenantKey(); + TransUtil tu = new TransUtil(); + String tableName = tu.getTableName(workflowID,tenantKey); + log.error("ZSRM_PUR_INFO_GY151_CheckAction requestid:"+requestId); + logUtil.setJklm("ZSRM_PUR_INFO_GY151_CheckAction"); + logUtil.setLx("1"); + logUtil.setBt(requestName); + logUtil.setLcid(requestId); + logUtil.setLclxid(workflowID); + RecordSet rs = I18nContextUtil.getBean(RecordSet.class); + String poolname = CONN_TYPE.workflow.getType(); + rs.setTenantKey(tenantKey); + String sfxywhjgxxjl = "";//工号 + String mainid = ""; + String sql = "select a.* from e10_core_business.dbo."+tableName+" a,e10_core_business.dbo.wfc_form_data b where a.FORM_DATA_ID =b.dataid and b.requestid ="+requestId; + rs.executeSql(sql,poolname); + if(rs.next()){ + sfxywhjgxxjl = Util.null2String(rs.getString("sfxywhjgxxjl")); + mainid = Util.null2String(rs.getString("FORM_DATA_ID")); + } + if("0".equals(sfxywhjgxxjl)){ + sql = "select * from e10_core_business.dbo."+commonDevUtil.getDetailTableName(tableName,"2")+" where FORM_DATA_ID="+mainid+" and is_delete =0 and tenant_key='"+tenantKey+"'"; + rs.executeSql(sql,poolname); + int cn=rs.getCounts(); + log.error(requestId+"dt2 count:"+cn); + String[][] str = new String[cn][21]; + int j=0; + while (rs.next()){ + str[j][0] = requestId + "_" + j; + str[j][1] = Util.null2String(rs.getString("cgzz")); + str[j][2] = Util.null2String(rs.getString("cgz")); + str[j][3] = Util.null2String(rs.getString("wl")); + str[j][4] = Util.null2String(rs.getString("gyszhh")); + str[j][5] = Util.null2String(rs.getString("dddw")); + str[j][6] = Util.null2String(rs.getString("jbdw")); + str[j][7] = Util.null2String(rs.getString("jbdwfz")); + str[j][8] = Util.null2String(rs.getString("zsdls")); + str[j][9] = Util.null2String(rs.getString("bzdls")); + str[j][10] = Util.null2String(rs.getString("ytjjhsj")); + str[j][11] = Util.null2String(rs.getString("xsgmsdm")); + str[j][12] = Util.null2String(rs.getString("jlfl")); + str[j][13] = Util.null2String(rs.getString("yxqsrq")).replaceAll("-", ""); + str[j][14] = Util.null2String(rs.getString("yxjzrq")).replaceAll("-", ""); + str[j][15] = Util.null2String(rs.getString("jjg")); + str[j][16] = Util.null2String(rs.getString("jbdw")); + str[j][17] = Util.null2String(rs.getString("gyswlz")); + str[j][18] = "X"; + str[j][19] = Util.null2String(rs.getString("hb")); + str[j][20] = requestId; + j++; + } + try { + log.error(requestId+"param:"+JSON.toJSONString(str)); + logUtil.setTscs(JSON.toJSONString(str)); + ZSRM_PUR_INFO info = new ZSRM_PUR_INFO(); + String[] ret = info.Getexecute(str); + logUtil.setFhxx(JSON.toJSONString(ret)); + log.error(requestId + "-[" + ret[0] + "," + ret[1] + "]"); + if (!"S".equals(ret[0])) { + logUtil.setJkzt("1"); + logUtil.insertLog(tenantKey); + return WeaResult.fail(500, "SAP返回错误信息：" + ret[1], new HashMap<>() ,false); + } + + } catch (Exception e) { + logUtil.setFhxx("异常信息："+e.getMessage()); + logUtil.setJkzt("2"); + logUtil.insertLog(tenantKey); + log.error(requestId+"e:"+e.getMessage()); + log.error("e",e); + return WeaResult.fail(500, "调用SAP接口校验数据出错："+e.getMessage(), new HashMap<>() ,false); + } + } + return WeaResult.success(); + } + + +} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java index 3ce0588..a7f3335 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSR_PUR_INFO_OEM_Action.java @@ -74,7 +74,7 @@ public class ZSR_PUR_INFO_OEM_Action extends BaseBean implements Action, EsbServ String detailTablename = commonDevUtil.getDetailTableName(tablename,"1"); - String sql = "select count(b.id) as mxcount from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id = b.form_data_id and a.FORM_DATA_ID =" + dataid + " and isnull(sfbjsc,1)<>0"; + String sql = "select count(b.id) as mxcount from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + detailTablename + " b where a.form_data_id = b.form_data_id and b.is_delete=0 and a.FORM_DATA_ID =" + dataid + " and isnull(sfbjsc,1)<>0"; logger_adc1e038.error("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ApiController.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ApiController.java index 4ac2a9c..fa48764 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ApiController.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ApiController.java @@ -41,8 +41,6 @@ import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -78,7 +76,7 @@ public class ApiController { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(ApiController.class); @GetMapping("/hello") //@PostMapping("/post") - public WeaResult hello(@RequestParam("key") String key , HttpServletResponse response) { + public WeaResult hello(@RequestParam("key") String key) { // todo api logger.error("ApiController info : hello " ); @@ -95,15 +93,6 @@ public class ApiController { Map map = new HashMap<>(); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - try { - String url = "http://party.hengtonggroup.com.cn:903/Account/SSO"; - logger.error("sendRedirect url == " + url); - response.sendRedirect(url); - } catch (IOException e) { - logger.error("sendRedirect err == " ,e); - throw new RuntimeException(e); - } - /** * 外部数据源 查询大数据 */ @@ -123,19 +112,19 @@ public class ApiController { /** * 外部数据源查询超时 */ -// String sql = "select count(1) as zs from atdpersoncardexview " + -// "where extype = '未刷卡' and shoulddate > '2024-12-01' and shoulddate < '2025-02-24'"; -// -// logger.error("sql == " +sql); -// boolean b1 = rs.executeQuery(sql, "hr"); -// -// logger.error("b1 == " + b1); -// logger.error("getExecuteResult == " +rs.getExecuteResult()); -// -// if(rs.next()){ -// logger.error("zs == " +rs.getString("zs")); -// map.put("zs", rs.getString("zs")); -// } + String sql = "select count(1) as zs from atdpersoncardexview " + + "where extype = '未刷卡' and shoulddate > '2024-12-01' and shoulddate < '2025-02-24'"; + + logger.error("sql == " +sql); + boolean b1 = rs.executeQuery(sql, "hr"); + + logger.error("b1 == " + b1); + logger.error("getExecuteResult == " +rs.getExecuteResult()); + + if(rs.next()){ + logger.error("zs == " +rs.getString("zs")); + map.put("zs", rs.getString("zs")); + } // logger.error("ApiController info : hello " ); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java index 89cda8c..140d1f9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/MessageSubscriptionController.java @@ -57,15 +57,50 @@ public class MessageSubscriptionController { String systemId = "SYS006"; String password = "123456"; String moudule = "流程待办"; + String moduleId = String.valueOf(params.get("moduleId")); String messages = ""; String content = String.valueOf(params.get("content")); String url = String.valueOf(params.get("pcUrl")); String mobileurl = String.valueOf(params.get("h5Url")); String pcurl = configProp.getHtportaloaUrl_pc_url()+new URL(url).getPath(); + + String replace = pcurl.replace("&", "&"); + String msgurl = configProp.getHtportaloaUrl_pc_url()+new URL(mobileurl).getPath(); - logger.error(" url: " + url); - logger.error(" pcurl: " + pcurl); + + if(StringUtils.isNotEmpty(moduleId)){ + switch (moduleId) { + case "100": + moudule = "通用模块"; + break; + case "101": + moudule = "用户"; + break; + case "113": + moudule = "文档"; + break; + case "116": + moudule = "日程"; + break; + case "117": + moudule = "工作报告"; + break; + case "124": + moudule = "公告"; + break; + case "225": + moudule = "短信"; + break; + case "227": + moudule = "系统提醒"; + break; + } + } +// +// logger.error(" url: " + url); +// logger.error(" pcurl: " + pcurl); + String m_msgtitle = String.valueOf(params.get("title")); String sendid = String.valueOf(params.get("senderId")); @@ -130,14 +165,14 @@ public class MessageSubscriptionController { String msgid = "MsgSYS006" + userid + (new Date()).getTime(); messages = messages + ""; - messages = messages + "" + msgid + "" + pre + "" + user + "" + msgtt + "" + msgtt + "" + sendname + "" + refurl + "" + msgtime + "" + target + "" + extdata + ""; + messages = messages + "" + msgid + "" + pre + "" + user + "" + msgtt + "" + msgtt + "" + sendname + "" + refurl.replace("&", "&") + "" + msgtime + "" + target + "" + extdata + ""; messages = messages + ""; if (!"流程待办".equals(moudule)) { String pctarget = "1"; pre = msgid; msgid = "MsgPCSYS006" + userid + (new Date()).getTime(); messages = messages + ""; - messages = messages + "" + msgid + "" + pre + "" + user + "" + msgtt + "" + msgtt + "" + sendname + "" + pcurl + "" + msgtime + "" + pctarget + "" + extdata + ""; + messages = messages + "" + msgid + "" + pre + "" + user + "" + msgtt + "" + msgtt + "" + sendname + "" + replace + "" + msgtime + "" + pctarget + "" + extdata + ""; messages = messages + ""; } } @@ -168,7 +203,7 @@ public class MessageSubscriptionController { } headers.put("Authorization", configProp.getUrl_password()); - logger.error(" Url_password(): " + configProp.getUrl_password()); +// logger.error(" Url_password(): " + configProp.getUrl_password()); logger.error(" moudule: " + moudule); logger.error(" messages: " + messages); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_DUPLICATE_CONTROLLER.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_DUPLICATE_CONTROLLER.java index 6c77f27..508a992 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_DUPLICATE_CONTROLLER.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_DUPLICATE_CONTROLLER.java @@ -1,14 +1,18 @@ package com.weaver.seconddev.interfaces.workflow.controller; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.seconddev.interfaces.workflow.action.ZOA_MM_MA_DUPLICATE; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.Context; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -24,31 +28,34 @@ import java.util.Map; @RestController @RequestMapping({"/papi/secondev/workflow/controller" }) public class ZOA_MM_MA_DUPLICATE_CONTROLLER { - @GetMapping("/ZOA_MM_MA_DUPLICATE") - public WeaResult run(@RequestParam Map params) { - log.error("ZOA_MM_MA_DUPLICATE_CONTROLLER execute start"); - log.error("ZOA_MM_MA_DUPLICATE_CONTROLLER execute params : " + params); + @PostMapping("/ZOA_MM_MA_DUPLICATE") + public WeaResult run(@Context HttpServletRequest request, @Context HttpServletResponse response) { + log.error("ZOA_MM_MA_DUPLICATE_CONTROLLER execute start1"); + String json = getbodyParam(request); + log.error("ZOA_MM_MA_DUPLICATE_CONTROLLER execute json:"+json); + JSONObject params = JSON.parseObject(json).getJSONObject("param"); + log.error("ZOA_MM_MA_DUPLICATE_CONTROLLER execute params : " + params.toJSONString()); try { - String index = null2String(params.get("index")); - String wlzbh = null2String(params.get("wlzbh")); - String wlzms = null2String(params.get("wlzms")); - String wlbm = null2String(params.get("wlbm")); - String wlms = null2String(params.get("wlms")); - String t1 = null2String(params.get("t1")); - String t2 = null2String(params.get("t2")); - String t3 = null2String(params.get("t3")); - String t4 = null2String(params.get("t4")); - String t5 = null2String(params.get("t5")); - String t6 = null2String(params.get("t6")); - String t7 = null2String(params.get("t7")); - String t8 = null2String(params.get("t8")); - String t9 = null2String(params.get("t9")); - String t10 = null2String(params.get("t10")); - String t11 = null2String(params.get("t11")); - String t12 = null2String(params.get("t12")); - String t13 = null2String(params.get("t13")); - String t14 = null2String(params.get("t14")); - String t15 = null2String(params.get("t15")); + String index = null2String(params.getString("index")); + String wlzbh = null2String(params.getString("wlzbh")); + String wlzms = null2String(params.getString("wlzms")); + String wlbm = null2String(params.getString("wlbm")); + String wlms = null2String(params.getString("wlms")); + String t1 = null2String(params.getString("t1")); + String t2 = null2String(params.getString("t2")); + String t3 = null2String(params.getString("t3")); + String t4 = null2String(params.getString("t4")); + String t5 = null2String(params.getString("t5")); + String t6 = null2String(params.getString("t6")); + String t7 = null2String(params.getString("t7")); + String t8 = null2String(params.getString("t8")); + String t9 = null2String(params.getString("t9")); + String t10 = null2String(params.getString("t10")); + String t11 = null2String(params.getString("t11")); + String t12 = null2String(params.getString("t12")); + String t13 = null2String(params.getString("t13")); + String t14 = null2String(params.getString("t14")); + String t15 = null2String(params.getString("t15")); String estatus = ""; String emessage = ""; @@ -201,6 +208,22 @@ public class ZOA_MM_MA_DUPLICATE_CONTROLLER { return WeaResult.fail(500, "ZOA_MM_MA_DUPLICATE_CONTROLLER execute error " +e, e); } } + private String getbodyParam(HttpServletRequest request) { + String jsonStr = "";//POST请求json数据 + try { + ServletInputStream inputStream = request.getInputStream(); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "utf-8")); + + String nextStr = "";//请求流中数据的下一行 + while ((nextStr = bufferedReader.readLine()) != null) { + jsonStr += nextStr; + } + }catch(Exception e){ + log.error("e",e); + } + + return jsonStr; + } public static String null2String(String s){ return s == null ? "" : s; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_VALIDITY_CONTROLLER.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_VALIDITY_CONTROLLER.java index 96360c0..c599133 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_VALIDITY_CONTROLLER.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/ZOA_MM_MA_VALIDITY_CONTROLLER.java @@ -1,14 +1,18 @@ package com.weaver.seconddev.interfaces.workflow.controller; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.seconddev.interfaces.workflow.action.ZOA_MM_MA_VALIDITY; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.Context; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.util.*; /** @@ -21,32 +25,35 @@ import java.util.*; @RestController @RequestMapping({"/papi/secondev/workflow/controller"}) public class ZOA_MM_MA_VALIDITY_CONTROLLER { - @GetMapping("/ZOA_MM_MA_VALIDITY") - public WeaResult run(@RequestParam Map params) { - log.error("ZOA_MM_MA_VALIDITY_CONTROLLER execute start"); - log.error("ZOA_MM_MA_VALIDITY_CONTROLLER execute params : " + params); + @PostMapping("/ZOA_MM_MA_VALIDITY") + public WeaResult run(@Context HttpServletRequest request, @Context HttpServletResponse response) { + log.error("ZOA_MM_MA_VALIDITY_CONTROLLER execute start1"); + String json = getbodyParam(request); + log.error("ZOA_MM_MA_VALIDITY_CONTROLLER execute json:"+json); + JSONObject params = JSON.parseObject(json).getJSONObject("param"); + log.error("ZOA_MM_MA_VALIDITY_CONTROLLER execute params : " + params.toJSONString()); try { - String index = full2HalfWidth(null2String(params.get("index"))); - String wlzbh = full2HalfWidth(null2String(params.get("wlzbh"))); - String wlzms = null2String(params.get("wlzms")); - String wlbm = full2HalfWidth(null2String(params.get("wlbm"))); - String wlms = full2HalfWidth(null2String(params.get("wlms"))); - String t1 = full2HalfWidth(null2String(params.get("t1"))); + String index = full2HalfWidth(null2String(params.getString("index"))); + String wlzbh = full2HalfWidth(null2String(params.getString("wlzbh"))); + String wlzms = null2String(params.getString("wlzms")); + String wlbm = full2HalfWidth(null2String(params.getString("wlbm"))); + String wlms = full2HalfWidth(null2String(params.getString("wlms"))); + String t1 = full2HalfWidth(null2String(params.getString("t1"))); log.error("ZOA_MM_MA_VALIDITY_CONTROLLER t1--" + t1); - String t2 = full2HalfWidth(null2String(params.get("t2"))); - String t3 = full2HalfWidth(null2String(params.get("t3"))); - String t4 = full2HalfWidth(null2String(params.get("t4"))); - String t5 = full2HalfWidth(null2String(params.get("t5"))); - String t6 = full2HalfWidth(null2String(params.get("t6"))); - String t7 = full2HalfWidth(null2String(params.get("t7"))); - String t8 = full2HalfWidth(null2String(params.get("t8"))); - String t9 = full2HalfWidth(null2String(params.get("t9"))); - String t10 = full2HalfWidth(null2String(params.get("t10"))); - String t11 = full2HalfWidth(null2String(params.get("t11"))); - String t12 = full2HalfWidth(null2String(params.get("t12"))); - String t13 = full2HalfWidth(null2String(params.get("t13"))); - String t14 = full2HalfWidth(null2String(params.get("t14"))); - String t15 = full2HalfWidth(null2String(params.get("t15"))); + String t2 = full2HalfWidth(null2String(params.getString("t2"))); + String t3 = full2HalfWidth(null2String(params.getString("t3"))); + String t4 = full2HalfWidth(null2String(params.getString("t4"))); + String t5 = full2HalfWidth(null2String(params.getString("t5"))); + String t6 = full2HalfWidth(null2String(params.getString("t6"))); + String t7 = full2HalfWidth(null2String(params.getString("t7"))); + String t8 = full2HalfWidth(null2String(params.getString("t8"))); + String t9 = full2HalfWidth(null2String(params.getString("t9"))); + String t10 = full2HalfWidth(null2String(params.getString("t10"))); + String t11 = full2HalfWidth(null2String(params.getString("t11"))); + String t12 = full2HalfWidth(null2String(params.getString("t12"))); + String t13 = full2HalfWidth(null2String(params.getString("t13"))); + String t14 = full2HalfWidth(null2String(params.getString("t14"))); + String t15 = full2HalfWidth(null2String(params.getString("t15"))); String estatus = ""; String emessage = ""; String[][] prdetail = null; @@ -198,7 +205,22 @@ public class ZOA_MM_MA_VALIDITY_CONTROLLER { return WeaResult.fail(500, "ZOA_MM_MA_VALIDITY_CONTROLLER execute error " + e, e); } } + private String getbodyParam(HttpServletRequest request) { + String jsonStr = "";//POST请求json数据 + try { + ServletInputStream inputStream = request.getInputStream(); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, "utf-8")); + String nextStr = "";//请求流中数据的下一行 + while ((nextStr = bufferedReader.readLine()) != null) { + jsonStr += nextStr; + } + }catch(Exception e){ + log.error("e",e); + } + + return jsonStr; + } public String full2HalfWidth(String str) { String outStr = ""; if(str.contains("ＯＲ")){ diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/message/SmsServiceImpl.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/message/SmsServiceImpl.java new file mode 100644 index 0000000..bd7213f --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/message/SmsServiceImpl.java @@ -0,0 +1,15 @@ +package com.weaver.seconddev.interfaces.workflow.message; + +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service("Message") +public class SmsServiceImpl implements EsbServerlessRpcRemoteInterface { + @Override + public WeaResult> execute(Map params) { + return null; + } +}