From b665b82165c0657275edbce90eb31249dae23541 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Mon, 6 Jan 2025 14:01:46 +0800 Subject: [PATCH] log,web --- .../workflow/action/DoTheAction.java | 2 +- .../action/ZWZX_CG_FileUploadAction.java | 4 +- .../action/ZZ_GDFileUploadAction.java | 6 +- .../action/ZZ_Ten_GDFileUploadAction.java | 6 +- .../seconddev/service/InHrmResource.java | 29 -- .../seconddev/service/entity/HrmResource.java | 293 ------------------ .../service/entity/HrmResourceReq.java | 52 ---- 7 files changed, 12 insertions(+), 380 deletions(-) delete mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java delete mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java delete mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java index 085c09e..84a208c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java @@ -318,7 +318,7 @@ public class DoTheAction { wri.setWorkflowBaseInfo(wbi); WorkflowServiceImpl WorkflowServicePortTypeProxy = I18nContextUtil.getBean(WorkflowServiceImpl.class); // TODO 方法参数:1 类型发生变化 e9类型:int e10类型:Long -// TODO config 管理员id +// TODO custom config 管理员id String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1046285013082546176L); logger_7213d31d.info("流程触发：" + requestid); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java index 33f3108..2c0ac47 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZWZX_CG_FileUploadAction.java @@ -148,9 +148,11 @@ public class ZWZX_CG_FileUploadAction extends BaseBean implements Action, EsbSer for (int i = 0; i < docs.length; i++) { String docid = docs[i]; String sql = " select b.filerealpath,b.iszip,b.name,b.imagefileid from " + " e10_core_business.dbo.fileobj b where b.imagefileid in(select max(imagefileid) " + "from e10_core_business.dbo.document_main_access as docimagefile where docid in(" + docid + ") group by docid)"; + logger_323752e9.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b1 = rs.executeSql(sql, poolname); + logger_323752e9.info("sql flag-----"+ b1); if (rs.next()) { JSONObject fileItem = new JSONObject(); String imagefileid = Util.null2String(rs.getString("imagefileid")); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java index bd22a8e..a92717d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java @@ -151,7 +151,8 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer logger_b14cb5d0.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b1 = rs.executeSql(sql, poolname); + logger_b14cb5d0.info("sql flag-----"+ b1); if (rs.next()) { JSONObject fileItem = new JSONObject(); String imagefileid = Util.null2String(rs.getString("imagefileid")); @@ -298,7 +299,8 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue; logger_b14cb5d0.info("getselectNameByCol sql = " + sql ); - recordSet.executeSql(sql, poolname_48); + boolean b1 = recordSet.executeSql(sql, poolname_48); + logger_b14cb5d0.info("getselectNameByCol flag = " + b1 ); if (recordSet.next()) { name = recordSet.getString("selectname"); logger_b14cb5d0.info("getselectNameByCol name = " + name ); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java index 2a97fdc..8fa3f2a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java @@ -161,7 +161,8 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe logger_8ab26152.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); + boolean b1 = rs.executeSql(sql, poolname); + logger_8ab26152.info("sql flag-----"+ b1); if (rs.next()) { JSONObject fileItem = new JSONObject(); @@ -302,7 +303,8 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue; logger_8ab26152.info("getselectNameByCol sql = " + sql); - recordSet.executeSql(sql, poolname_w2); + boolean b1 = recordSet.executeSql(sql, poolname_w2); + logger_8ab26152.info("getselectNameByCol flag = " + b1); if (recordSet.next()) { name = recordSet.getString("selectname"); } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java b/secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java deleted file mode 100644 index 4bcba42..0000000 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/service/InHrmResource.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.weaver.seconddev.service; - -import com.weaver.seconddev.service.entity.HrmResourceReq; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service("InHrmResource") -public class InHrmResource { - - - private static final Logger logger = LoggerFactory.getLogger(InHrmResource.class); - - - @Autowired - private HrmResourceReq hrmResourceReq; - - - public String inHrmResource(String param){ - //实现自定义webservice接口逻辑 - - logger.info("InHrmResource webservice param = " + param); - - return "request success"; - } - - -} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java b/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java deleted file mode 100644 index 8dc7ee2..0000000 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResource.java +++ /dev/null @@ -1,293 +0,0 @@ -package com.weaver.seconddev.service.entity; - -public class HrmResource { - String uid = "";// workcode - String cn = "";// lastname - String password = "";// password(MD5加密) - String accountstatus = "";// loginid(默认为工号) - String guid = "";// textfield1 - String companyid = "";// subcompanyid1 - String departmentid = "";// departmentid - String postid = "";// jobtitle - String sex = "";// sex - String highlevel = "";// manager - String employeestatus = "";// status - String birthday = "";// birthday - String nativeplace = "";// nativeplace - String politicalstatus = "";// policy - String domicile = "";// residentplace - String mobile = "";// mobile - String graduatedfrom = "";// textfield4 - String education = "";// textfield3 - String major = "";// textfield5 - String startpostdate = "";// datefield2 - String identitycard = "";// certificatenum - String enterhtdate = "";// datefield1 - String cardnumber = "";// textfield2 - String wordtel = "";// telephone - String joblevel = "";// joblevel - String permanentaddress = "";// homeaddress - String maritalstatus = "";// maritalstatus - String mail = "";// email - String operation = ""; // 操作 - - String companyguid = "";// cmpguid - String departmentguid = "";// deptguid - String postguid = "";// postgudi - - public String getUid() { - return uid; - } - - public void setUid(String uid) { - this.uid = uid; - } - - public String getCn() { - return cn; - } - - public void setCn(String cn) { - this.cn = cn; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getAccountstatus() { - return accountstatus; - } - - public void setAccountstatus(String accountstatus) { - this.accountstatus = accountstatus; - } - - public String getGuid() { - return guid; - } - - public void setGuid(String guid) { - this.guid = guid; - } - - public String getCompanyid() { - return companyid; - } - - public void setCompanyid(String companyid) { - this.companyid = companyid; - } - - public String getDepartmentid() { - return departmentid; - } - - public void setDepartmentid(String departmentid) { - this.departmentid = departmentid; - } - - public String getPostid() { - return postid; - } - - public void setPostid(String postid) { - this.postid = postid; - } - - public String getSex() { - return sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public String getHighlevel() { - return highlevel; - } - - public void setHighlevel(String highlevel) { - this.highlevel = highlevel; - } - - public String getEmployeestatus() { - return employeestatus; - } - - public void setEmployeestatus(String employeestatus) { - this.employeestatus = employeestatus; - } - - public String getBirthday() { - return birthday; - } - - public void setBirthday(String birthday) { - this.birthday = birthday; - } - - public String getNativeplace() { - return nativeplace; - } - - public void setNativeplace(String nativeplace) { - this.nativeplace = nativeplace; - } - - public String getPoliticalstatus() { - return politicalstatus; - } - - public void setPoliticalstatus(String politicalstatus) { - this.politicalstatus = politicalstatus; - } - - public String getDomicile() { - return domicile; - } - - public void setDomicile(String domicile) { - this.domicile = domicile; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getGraduatedfrom() { - return graduatedfrom; - } - - public void setGraduatedfrom(String graduatedfrom) { - this.graduatedfrom = graduatedfrom; - } - - public String getEducation() { - return education; - } - - public void setEducation(String education) { - this.education = education; - } - - public String getMajor() { - return major; - } - - public void setMajor(String major) { - this.major = major; - } - - public String getStartpostdate() { - return startpostdate; - } - - public void setStartpostdate(String startpostdate) { - this.startpostdate = startpostdate; - } - - public String getIdentitycard() { - return identitycard; - } - - public void setIdentitycard(String identitycard) { - this.identitycard = identitycard; - } - - public String getEnterhtdate() { - return enterhtdate; - } - - public void setEnterhtdate(String enterhtdate) { - this.enterhtdate = enterhtdate; - } - - public String getCardnumber() { - return cardnumber; - } - - public void setCardnumber(String cardnumber) { - this.cardnumber = cardnumber; - } - - public String getWordtel() { - return wordtel; - } - - public void setWordtel(String wordtel) { - this.wordtel = wordtel; - } - - public String getJoblevel() { - return joblevel; - } - - public void setJoblevel(String joblevel) { - this.joblevel = joblevel; - } - - public String getPermanentaddress() { - return permanentaddress; - } - - public void setPermanentaddress(String permanentaddress) { - this.permanentaddress = permanentaddress; - } - - public String getMaritalstatus() { - return maritalstatus; - } - - public void setMaritalstatus(String maritalstatus) { - this.maritalstatus = maritalstatus; - } - - public String getMail() { - return mail; - } - - public void setMail(String mail) { - this.mail = mail; - } - - public String getOperation() { - return operation; - } - - public void setOperation(String operation) { - this.operation = operation; - } - - public String getCompanyguid() { - return companyguid; - } - - public void setCompanyguid(String companyguid) { - this.companyguid = companyguid; - } - - public String getDepartmentguid() { - return departmentguid; - } - - public void setDepartmentguid(String departmentguid) { - this.departmentguid = departmentguid; - } - - public String getPostguid() { - return postguid; - } - - public void setPostguid(String postguid) { - this.postguid = postguid; - } -} \ No newline at end of file diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java b/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java deleted file mode 100644 index af882c3..0000000 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/service/entity/HrmResourceReq.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.weaver.seconddev.service.entity; - -import org.slf4j.LoggerFactory; - -public class HrmResourceReq { - - public static final org.slf4j.Logger logger_fe319dbb = LoggerFactory.getLogger(HrmResourceReq.class); - - // workcode - String SENDID = ""; - - // lastname - String ITFID = ""; - - // password(MD5加密) - String SYSID = ""; - - // hrmResource - HrmResource[] DATAS; - - public String getSENDID() { - return SENDID; - } - - public void setSENDID(String paramSENDID) { - this.SENDID = paramSENDID; - } - - public String getITFID() { - return ITFID; - } - - public void setITFID(String paramITFID) { - this.ITFID = paramITFID; - } - - public String getSYSID() { - return SYSID; - } - - public void setSYSID(String paramSYSID) { - this.SYSID = paramSYSID; - } - - public HrmResource[] getDATAS() { - return DATAS; - } - - public void setDATAS(HrmResource[] paramDATAS) { - this.DATAS = paramDATAS; - } -}