diff --git a/.idea/haojing.iml b/.idea/haojing.iml index d901a3c5..7a0aeae6 100644 --- a/.idea/haojing.iml +++ b/.idea/haojing.iml @@ -9,7 +9,20 @@ - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/libctg.xml b/.idea/libraries/libctg.xml new file mode 100644 index 00000000..81a4d179 --- /dev/null +++ b/.idea/libraries/libctg.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/interface/hjkj/updateDepartMentCode.jsp b/interface/hjkj/updateDepartMentCode.jsp index a7895972..07f69b7a 100644 --- a/interface/hjkj/updateDepartMentCode.jsp +++ b/interface/hjkj/updateDepartMentCode.jsp @@ -1,10 +1,10 @@ -<%@ page import="java.util.Map" %> -<%@ page import="java.util.List" %> -<%@ page import="java.util.Objects" %> -<%@ page import="weaver.interfaces.util.ReadExcel" %> <%@ page import="weaver.conn.RecordSet" %> <%@ page import="weaver.general.Util" %> +<%@ page import="weaver.interfaces.dito.util.ReadExcel" %> <%@ page import="java.util.HashMap" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Objects" %> <%-- diff --git a/interface/hjkj/updateHrmresource.jsp b/interface/hjkj/updateHrmresource.jsp index 0679351c..97861120 100644 --- a/interface/hjkj/updateHrmresource.jsp +++ b/interface/hjkj/updateHrmresource.jsp @@ -1,12 +1,12 @@ -<%@ page import="java.util.Map" %> -<%@ page import="java.util.List" %> -<%@ page import="java.util.Objects" %> -<%@ page import="weaver.interfaces.util.ReadExcel" %> +<%@ page import="org.apache.commons.codec.digest.DigestUtils" %> <%@ page import="weaver.conn.RecordSet" %> +<%@ page import="weaver.general.TimeUtil" %> <%@ page import="weaver.general.Util" %> +<%@ page import="weaver.interfaces.dito.util.ReadExcel" %> <%@ page import="java.util.HashMap" %> -<%@ page import="org.apache.commons.codec.digest.DigestUtils" %> -<%@ page import="weaver.general.TimeUtil" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Objects" %> <%-- diff --git a/interface/hjkj/updatePost.jsp b/interface/hjkj/updatePost.jsp index 66c1e46d..f09a03bd 100644 --- a/interface/hjkj/updatePost.jsp +++ b/interface/hjkj/updatePost.jsp @@ -1,9 +1,8 @@ -<%@ page import="weaver.interfaces.util.ReadExcel" %> <%@ page import="weaver.conn.RecordSet" %> +<%@ page import="weaver.general.TimeUtil" %> <%@ page import="weaver.general.Util" %> +<%@ page import="weaver.interfaces.dito.util.ReadExcel" %> <%@ page import="java.util.*" %> -<%@ page import="weaver.general.TimeUtil" %> -<%@ page import="weaver.backup.fkcustomer.FkCustomerBrowserDef" %> <%-- diff --git a/interface/hjkj/updatePostUser.jsp b/interface/hjkj/updatePostUser.jsp index c931d5fc..b46facca 100644 --- a/interface/hjkj/updatePostUser.jsp +++ b/interface/hjkj/updatePostUser.jsp @@ -1,9 +1,11 @@ -<%@ page import="weaver.interfaces.util.ReadExcel" %> <%@ page import="weaver.conn.RecordSet" %> -<%@ page import="weaver.general.Util" %> -<%@ page import="java.util.*" %> <%@ page import="weaver.general.TimeUtil" %> -<%@ page import="weaver.backup.fkcustomer.FkCustomerBrowserDef" %> +<%@ page import="weaver.general.Util" %> +<%@ page import="weaver.interfaces.dito.util.ReadExcel" %> +<%@ page import="java.util.HashMap" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Objects" %> <%-- diff --git a/interface/hjkj/updateRole.jsp b/interface/hjkj/updateRole.jsp index 07c7cfda..4bd6ec11 100644 --- a/interface/hjkj/updateRole.jsp +++ b/interface/hjkj/updateRole.jsp @@ -1,9 +1,10 @@ -<%@ page import="weaver.interfaces.util.ReadExcel" %> <%@ page import="weaver.conn.RecordSet" %> <%@ page import="weaver.general.Util" %> -<%@ page import="java.util.*" %> -<%@ page import="weaver.general.TimeUtil" %> -<%@ page import="weaver.backup.fkcustomer.FkCustomerBrowserDef" %> +<%@ page import="weaver.interfaces.dito.util.ReadExcel" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Objects" %> +<%@ page import="java.util.UUID" %> <%-- diff --git a/interface/hjkj/updateRoleUser.jsp b/interface/hjkj/updateRoleUser.jsp index 6dacaefb..d23bb605 100644 --- a/interface/hjkj/updateRoleUser.jsp +++ b/interface/hjkj/updateRoleUser.jsp @@ -1,10 +1,10 @@ -<%@ page import="weaver.interfaces.util.ReadExcel" %> <%@ page import="weaver.conn.RecordSet" %> <%@ page import="weaver.general.Util" %> -<%@ page import="java.util.*" %> -<%@ page import="weaver.general.TimeUtil" %> -<%@ page import="weaver.backup.fkcustomer.FkCustomerBrowserDef" %> -<%@ page import="com.icbc.api.internal.apache.http.impl.cookie.S" %> +<%@ page import="weaver.interfaces.dito.util.ReadExcel" %> +<%@ page import="java.util.List" %> +<%@ page import="java.util.Map" %> +<%@ page import="java.util.Objects" %> +<%@ page import="java.util.UUID" %> <%-- diff --git a/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java b/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java index 188da678..0b05d36c 100644 --- a/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java @@ -66,9 +66,10 @@ public class SendPortalDoneUtil { String urlPc = "[newtab]" + bpm_workflowurl + "/workflow/request/ViewRequestForwardSPA.jsp?requestid=" + requestid; String app_requestUrl = bpm_app_requesturl + requestid; app_requestUrl = URLEncoder.encode(app_requestUrl, "UTF-8"); - String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; // String urlDing = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")); @@ -200,9 +201,10 @@ public class SendPortalDoneUtil { String urlPc = "[newtab]" + bpm_workflowurl + "/workflow/request/ViewRequestForwardSPA.jsp?requestid=" + requestid; String app_requestUrl = bpm_app_requesturl + requestid; app_requestUrl = URLEncoder.encode(app_requestUrl, "UTF-8"); - String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; // String urlDing = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")); @@ -258,9 +260,10 @@ public class SendPortalDoneUtil { String urlPc = "[newtab]" + bpm_workflowurl + "/workflow/request/ViewRequestForwardSPA.jsp?requestid=" + requestid; String app_requestUrl = bpm_app_requesturl + requestid; app_requestUrl = URLEncoder.encode(app_requestUrl, "UTF-8"); - String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; // String urlDing = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")); @@ -384,9 +387,10 @@ public class SendPortalDoneUtil { String urlPc = "[newtab]" + bpm_workflowurl + "/workflow/request/ViewRequestForwardSPA.jsp?requestid=" + requestid; String app_requestUrl = bpm_app_requesturl + requestid; app_requestUrl = URLEncoder.encode(app_requestUrl, "UTF-8"); - String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; // String urlDing = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")); @@ -479,9 +483,10 @@ public class SendPortalDoneUtil { String urlPc = "[newtab]" + bpm_workflowurl + "/workflow/request/ViewRequestForwardSPA.jsp?requestid=" + requestid; String app_requestUrl = bpm_app_requesturl + requestid; app_requestUrl = URLEncoder.encode(app_requestUrl, "UTF-8"); - String urlApp = "[newtab]" + bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlApp = "[newtab]" + bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; sql = " select t1.workflowid,t1.requestname,t1.requestmark,t1.creater,t1.createdate,t1.createtime,h1.lastname,h1.loginid,\n" + " t1.requestid as taskCode,t1.currentnodeid as nodeid,d1.nodename\n" + " from workflow_requestbase t1\n" + diff --git a/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java b/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java index 2d37d544..0b38f4c1 100644 --- a/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java @@ -79,8 +79,11 @@ public class SendPortalToReadUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; String app_requestUrl = bpm_app_requesturl+requestid; app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); - String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; - String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; +// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; + String replace = bpm_app_workflowurl.replace("/bpm", ""); + String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp=replace+bpm_app_requesturl+requestid; +// String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")) ; requestObject.put("center",center); @@ -285,8 +288,11 @@ public class SendPortalToReadUtil { String urlPc = "[newtab]" + bpm_workflowurl + "/workflow/request/ViewRequestForwardSPA.jsp?requestid=" + requestid; String app_requestUrl = bpm_app_requesturl + requestid; app_requestUrl = URLEncoder.encode(app_requestUrl, "UTF-8"); - String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; - String urlDing = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlApp = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; +// String urlDing = bpm_app_workflowurl + "/interface/mobilelogin/loginsso.jsp?em_auth_usercode=" + workcode + "&forwardurl=" + app_requestUrl; + String replace = bpm_app_workflowurl.replace("/bpm", ""); + String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp=replace+bpm_app_requesturl+requestid; String nodeName = Util.null2String(rs.getString("nodeName")); requestObject.put("center", center); diff --git a/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java index b138b772..33097cfb 100644 --- a/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java @@ -84,9 +84,10 @@ public class SendPortalTodoUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestId ; String app_requestUrl = bpm_app_requesturl+requestId; app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); - String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; +// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestId; + String urlApp = replace+bpm_app_requesturl+requestId; bb.writeLog("urlDing", urlDing); // String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")) ; @@ -231,9 +232,10 @@ public class SendPortalTodoUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; String app_requestUrl = bpm_app_requesturl+requestid; app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); - String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; +// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; bb.writeLog("urlDing", urlDing); // String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")) ; @@ -400,9 +402,10 @@ public class SendPortalTodoUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; String app_requestUrl = bpm_app_requesturl+requestid; app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); - String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; +// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; bb.writeLog("urlDing", urlDing); String nodeName = Util.null2String(rs.getString("nodeName")) ; @@ -460,9 +463,10 @@ public class SendPortalTodoUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; String app_requestUrl = bpm_app_requesturl+requestid; app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); - String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; +// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; bb.writeLog("urlDing", urlDing); // String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")) ; @@ -610,9 +614,10 @@ public class SendPortalTodoUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; String app_requestUrl = bpm_app_requesturl+requestid; app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); - String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; +// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String replace = bpm_app_workflowurl.replace("/bpm", ""); String urlDing = replace+bpm_app_requesturl+requestid; + String urlApp = replace+bpm_app_requesturl+requestid; bb.writeLog("urlDing", urlDing); // String urlDing = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+workcode+"&forwardurl="+app_requestUrl; String nodeName = Util.null2String(rs.getString("nodeName")) ; diff --git a/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java index 8cdd148c..e36c4b4c 100644 --- a/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java +++ b/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java @@ -25,6 +25,7 @@ public class ImportExcelPostUtil { */ public Map operatePostExcel(List> datalists) { + logger.info("ImportExcelPostUtil:start"); int scount = 0; int fcount = 0; int ecount = 0; @@ -42,7 +43,7 @@ public class ImportExcelPostUtil { String ORG_ID = Util.null2String(m.get("org_id")); String deptid = getHrmdepartmentId(ORG_ID); - boolean flag = insertPost(m,SYS_POST_NAME, creater, created, modified, modifier, SYS_POST_CODE, deptid,SYS_POST_DESC); + boolean flag = insertPost(m, SYS_POST_NAME, creater, created, modified, modifier, SYS_POST_CODE, Integer.parseInt(deptid), SYS_POST_DESC); if (flag) { scount++; } else { @@ -75,7 +76,7 @@ public class ImportExcelPostUtil { * @param SYS_POST_DESC * @return */ - private boolean insertPost(Map m,String SYS_POST_NAME, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId,String SYS_POST_DESC) { + private boolean insertPost(Map m,String SYS_POST_NAME, String creater, String created, String modified, String modifier, String sysPostCode, int departmentId,String SYS_POST_DESC) { RecordSet rs = new RecordSet(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); String nowDateTime = sdf.format(new Date()); @@ -146,7 +147,7 @@ public class ImportExcelPostUtil { private String getHrmdepartmentId(String ORG_ID) { String deptid = "" ; RecordSet rs = new RecordSet(); - String sql = " select h.id from hrmdepartmentdefined t where t.orgid = ? " ; + String sql = " select t.id from hrmdepartmentdefined t where t.deptid = ? " ; rs.executeQuery(sql,new Object[]{ORG_ID}); if (rs.next()) { deptid = Util.null2String(rs.getString("id")); diff --git a/src/com/engine/dito/excel/cmd/ImportExcelUserPostUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelUserPostUtil.java index 79e13252..04be40cd 100644 --- a/src/com/engine/dito/excel/cmd/ImportExcelUserPostUtil.java +++ b/src/com/engine/dito/excel/cmd/ImportExcelUserPostUtil.java @@ -2,6 +2,8 @@ package com.engine.dito.excel.cmd; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import weaver.conn.RecordSet; import weaver.formmode.setup.ModeRightInfo; import weaver.general.BaseBean; @@ -14,13 +16,13 @@ import java.util.*; public class ImportExcelUserPostUtil { + private final static Logger logger = LoggerFactory.getLogger(ImportExcelPostUtil.class); /*** * * @param datalists */ - public Map operatePostExcel(List> datalists) - { + public Map operatePostExcel(List> datalists) { int scount = 0; int fcount = 0; int ecount = 0; @@ -31,16 +33,14 @@ public class ImportExcelUserPostUtil { String updateStaff = "1"; String tableName = "system_user_post"; - for (int i = 0; i < datalists.size(); i++) - { - try{ + for (int i = 0; i < datalists.size(); i++) { + try { Map m = datalists.get(i); String SYS_POST_CODE = Util.null2String(m.get("sys_post_code")); String SYS_USER_CODE = Util.null2String(m.get("sys_user_code")); - String jobtitlesId = "" ; - if(StringUtils.isNotEmpty(SYS_POST_CODE)) - { + String jobtitlesId = ""; + if (StringUtils.isNotEmpty(SYS_POST_CODE)) { String queryRoleIdSql = " select id from hrmjobtitles where jobtitlecode=? "; bb.writeLog("queryRoleIdSql:" + queryRoleIdSql); rs.executeQuery(queryRoleIdSql, new Object[]{SYS_POST_CODE}); @@ -49,9 +49,8 @@ public class ImportExcelUserPostUtil { } } - String userId = "" ; - if(StringUtils.isNotEmpty(SYS_USER_CODE)) - { + String userId = ""; + if (StringUtils.isNotEmpty(SYS_USER_CODE)) { String sql = " select id from hrmresource where workcode=?"; bb.writeLog("sql:" + sql); rs.executeQuery(sql, new Object[]{SYS_USER_CODE}); @@ -60,29 +59,28 @@ public class ImportExcelUserPostUtil { } } - if(StringUtils.isNotEmpty(userId)) - { + if (StringUtils.isNotEmpty(userId)) { String updateUserJobSql = " update hrmresource set jobtitle=?,modified=?,modifier=? where id=? "; - bb.writeLog("updateUserJobSql:"+updateUserJobSql); - boolean flag = rs.executeUpdate(updateUserJobSql,new Object[]{jobtitlesId,currentDateTime,updateStaff,userId}); - bb.writeLog(" updateUserJobFlag: "+flag); - if(!flag){ - Map dataMap = new HashMap(); - dataMap.put("syndate",currentDateTime); + bb.writeLog("updateUserJobSql:" + updateUserJobSql); + boolean flag = rs.executeUpdate(updateUserJobSql, new Object[]{jobtitlesId, currentDateTime, updateStaff, userId}); + bb.writeLog(" updateUserJobFlag: " + flag); + if (!flag) { + Map dataMap = new HashMap(); + dataMap.put("syndate", currentDateTime); dataMap.put("reqmessage", JSONObject.toJSONString(m)); - dataMap.put("errmessage","更新人员岗位sql执行错误"); - dataMap.put("systable",tableName); + dataMap.put("errmessage", "更新人员岗位sql执行错误"); + dataMap.put("systable", tableName); recordErrorData(dataMap); } } - }catch (Exception e){ + } catch (Exception e) { ecount++; } } - Map map = new HashMap(); - map.put("scount",scount+""); - map.put("fcount",fcount+""); - map.put("ecount",ecount+""); + Map map = new HashMap(); + map.put("scount", scount + ""); + map.put("fcount", fcount + ""); + map.put("ecount", ecount + ""); return map; } @@ -100,24 +98,21 @@ public class ImportExcelUserPostUtil { * @param SYS_POST_DESC * @return */ - private boolean insertUserPost(String SYS_POST_NAME, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId,String SYS_POST_DESC) { + private boolean insertUserPost(String SYS_POST_NAME, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId, String SYS_POST_DESC) { RecordSet rs = new RecordSet(); - String defaultJobActivityId = "" ; + String defaultJobActivityId = ""; String defaultJobActivityName = PropBean.getUfPropValue("defaultJobActivityName"); - if(StringUtils.isNotEmpty(defaultJobActivityName)) - { - String sql = " select * from hrmjobactivities where jobactivityname = ?" ; - rs.executeQuery(sql,new Object[]{defaultJobActivityName}); - if(rs.next()){ + if (StringUtils.isNotEmpty(defaultJobActivityName)) { + String sql = " select * from hrmjobactivities where jobactivityname = ?"; + rs.executeQuery(sql, new Object[]{defaultJobActivityName}); + if (rs.next()) { defaultJobActivityId = Util.null2String(rs.getString("id")); } - if(StringUtils.isEmpty(defaultJobActivityId)) - { - String defaultJobGroupsId = getDefaultJobGroupsId(created,creater) ; - if(StringUtils.isNotEmpty(defaultJobGroupsId)) - { - defaultJobActivityId = getDefaultJobActivityId(defaultJobActivityName,created,creater,defaultJobGroupsId); + if (StringUtils.isEmpty(defaultJobActivityId)) { + String defaultJobGroupsId = getDefaultJobGroupsId(created, creater); + if (StringUtils.isNotEmpty(defaultJobGroupsId)) { + defaultJobActivityId = getDefaultJobActivityId(defaultJobActivityName, created, creater, defaultJobGroupsId); } } } @@ -125,16 +120,16 @@ public class ImportExcelUserPostUtil { boolean iflag = false; String jobtitlesid = ""; String sql = "select id from hrmjobtitles where jobtitlecode = ?"; - rs.executeQuery(sql,new Object[]{sysPostCode}); - while (rs.next()){ + rs.executeQuery(sql, new Object[]{sysPostCode}); + while (rs.next()) { jobtitlesid = Util.null2String(rs.getString("id")); } - if(StringUtils.isNotEmpty(jobtitlesid)){ + if (StringUtils.isNotEmpty(jobtitlesid)) { String updateHrmjobactivitiesSl = " update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?"; - iflag = rs.executeUpdate(updateHrmjobactivitiesSl,SYS_POST_DESC,SYS_POST_NAME,modified,modifier,jobtitlesid); + iflag = rs.executeUpdate(updateHrmjobactivitiesSl, SYS_POST_DESC, SYS_POST_NAME, modified, modifier, jobtitlesid); - }else{ + } else { String uuid = UUID.randomUUID().toString(); String insertHrmjobactivitiesSql = " insert into hrmjobtitles(jobtitlemark,jobtitlename,jobactivityid,jobdepartmentid,jobtitlecode,created,creater,modified,modifier,uuid) values(?,?,?,?,?,?,?,?,?,?)"; iflag = rs.executeUpdate(insertHrmjobactivitiesSql, new Object[]{SYS_POST_DESC, SYS_POST_NAME, defaultJobActivityId, departmentId, sysPostCode, created, creater, modified, modifier, uuid}); @@ -151,8 +146,8 @@ public class ImportExcelUserPostUtil { private Map getSubcompanyid1(String ORG_ID) { Map res = new HashMap(); RecordSet rs = new RecordSet(); - String sql = " select h.id,h.subcompanyid1 from hrmdepartmentdefined t inner join hrmdepartment h on h.id = t.deptid where t.orgid = ? " ; - rs.executeQuery(sql,new Object[]{ORG_ID}); + String sql = " select h.id,h.subcompanyid1 from hrmdepartmentdefined t inner join hrmdepartment h on h.id = t.deptid where t.orgid = ? "; + rs.executeQuery(sql, new Object[]{ORG_ID}); if (rs.next()) { String deptid = Util.null2String(rs.getString("id")); String subcompanyid1 = Util.null2String(rs.getString("subcompanyid1")); @@ -167,62 +162,58 @@ public class ImportExcelUserPostUtil { * * @return */ - public String getDefaultJobGroupsId(String created,String creater){ + public String getDefaultJobGroupsId(String created, String creater) { RecordSet rs = new RecordSet(); - String defaultJobGroupsId = "" ; - try{ + String defaultJobGroupsId = ""; + try { String defaultJobGroupsName = PropBean.getUfPropValue("defaultJobGroupsName"); - if(StringUtils.isNotEmpty(defaultJobGroupsName)) - { - String sql = " select id from hrmjobgroups where jobgroupname = ?" ; - rs.executeQuery(sql,new Object[]{defaultJobGroupsName}); - if(rs.next()){ + if (StringUtils.isNotEmpty(defaultJobGroupsName)) { + String sql = " select id from hrmjobgroups where jobgroupname = ?"; + rs.executeQuery(sql, new Object[]{defaultJobGroupsName}); + if (rs.next()) { defaultJobGroupsId = Util.null2String(rs.getString("id")); } - if(StringUtils.isEmpty(defaultJobGroupsId)) - { + if (StringUtils.isEmpty(defaultJobGroupsId)) { String uuid = UUID.randomUUID().toString(); sql = " insert into hrmjobgroups(jobgroupname,jobgroupremark,created,creater,uuid) values(?,?,?,?,?) "; - boolean flag = rs.executeUpdate(sql,new Object[]{defaultJobGroupsName,defaultJobGroupsName,created,creater,uuid}); - if(flag){ - sql = " select id from hrmjobgroups where jobgroupname = ?" ; - rs.executeQuery(sql,new Object[]{defaultJobGroupsName}); - if(rs.next()){ + boolean flag = rs.executeUpdate(sql, new Object[]{defaultJobGroupsName, defaultJobGroupsName, created, creater, uuid}); + if (flag) { + sql = " select id from hrmjobgroups where jobgroupname = ?"; + rs.executeQuery(sql, new Object[]{defaultJobGroupsName}); + if (rs.next()) { defaultJobGroupsId = Util.null2String(rs.getString("id")); } } } } - }catch (Exception e){ + } catch (Exception e) { } return defaultJobGroupsId; } /** - * * @return */ - public String getDefaultJobActivityId(String defaultJobActivityName,String created,String creater,String defaultJobGroupsId){ + public String getDefaultJobActivityId(String defaultJobActivityName, String created, String creater, String defaultJobGroupsId) { RecordSet rs = new RecordSet(); - String defaultJobActivityId = "" ; - try{ - if(StringUtils.isNotEmpty(defaultJobActivityName)) - { + String defaultJobActivityId = ""; + try { + if (StringUtils.isNotEmpty(defaultJobActivityName)) { String uuid = UUID.randomUUID().toString(); String sql = " insert into hrmjobactivities(jobactivitymark,jobactivityname,jobgroupid,created,creater,uuid) values(?,?,?,?,?,?) "; - boolean flag = rs.executeUpdate(sql,new Object[]{defaultJobActivityName,defaultJobActivityName,defaultJobGroupsId,created,creater,uuid}); - if(flag){ - sql = " select id from hrmjobgroups where jobgroupname = ?" ; - rs.executeQuery(sql,new Object[]{defaultJobActivityName}); - if(rs.next()){ + boolean flag = rs.executeUpdate(sql, new Object[]{defaultJobActivityName, defaultJobActivityName, defaultJobGroupsId, created, creater, uuid}); + if (flag) { + sql = " select id from hrmjobgroups where jobgroupname = ?"; + rs.executeQuery(sql, new Object[]{defaultJobActivityName}); + if (rs.next()) { defaultJobActivityId = Util.null2String(rs.getString("id")); } } } - }catch (Exception e){ + } catch (Exception e) { } return defaultJobActivityId; @@ -233,66 +224,64 @@ public class ImportExcelUserPostUtil { * * @param dataMap */ - public void recordErrorData(Map dataMap){ + public void recordErrorData(Map dataMap) { - String uftable = "uf_orgmq" ; + String uftable = "uf_orgmq"; RecordSet rs = new RecordSet(); BaseBean bb = new BaseBean(); - ModeRightInfo mode=new ModeRightInfo(); + ModeRightInfo mode = new ModeRightInfo(); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");//当前时间日期 SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm:ss"); - int formmodeid = 0 ; - String modedatacreater = "1" ; - String modedatacreatertype = "0" ; + int formmodeid = 0; + String modedatacreater = "1"; + String modedatacreatertype = "0"; String modedatacreatedate = sdf1.format(new Date()); String modedatacreatetime = sdf2.format(new Date()); String uuid = UUID.randomUUID().toString(); try { - String sql =" select k.id from modeinfo k \n" + + String sql = " select k.id from modeinfo k \n" + " inner join workflow_bill l on formid = l.id\n" + - " where l.tablename = ? " ; - rs.executeQuery(sql,new Object[]{uftable}); - if(rs.next()){ + " where l.tablename = ? "; + rs.executeQuery(sql, new Object[]{uftable}); + if (rs.next()) { formmodeid = Util.getIntValue(Util.null2String(rs.getString("id"))); } - String syndate = Util.null2String(dataMap.get("syndate")); - String reqmessage = Util.null2String(dataMap.get("reqmessage")); - String errmessage = Util.null2String(dataMap.get("errmessage")); - String systable = Util.null2String(dataMap.get("systable")); + String syndate = Util.null2String(dataMap.get("syndate")); + String reqmessage = Util.null2String(dataMap.get("reqmessage")); + String errmessage = Util.null2String(dataMap.get("errmessage")); + String systable = Util.null2String(dataMap.get("systable")); int bool = 0; - sql =" insert into "+uftable+"(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" + - " values(?,?,?,?,?,?,?,?,?,?)" ; - boolean flag = rs.executeUpdate(sql,new Object[]{uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable}); - bb.writeLog("sql;"+sql); - if(flag){ + sql = " insert into " + uftable + "(uuid,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,syndate,reqmessage,errmessage,systable)" + + " values(?,?,?,?,?,?,?,?,?,?)"; + boolean flag = rs.executeUpdate(sql, new Object[]{uuid, formmodeid, modedatacreater, modedatacreatertype, modedatacreatedate, modedatacreatetime, syndate, reqmessage, errmessage, systable}); + bb.writeLog("sql;" + sql); + if (flag) { bool++; } - bb.writeLog("bool;"+bool); - if(bool>0) - { + bb.writeLog("bool;" + bool); + if (bool > 0) { String dataid = ""; - sql = " select * from "+uftable+" where uuid=? "; + sql = " select * from " + uftable + " where uuid=? "; bb.writeLog("sql:" + sql); - rs.executeQuery(sql,new Object[]{uuid}); + rs.executeQuery(sql, new Object[]{uuid}); if (rs.next()) { dataid = Util.null2String(rs.getString("id")); } bb.writeLog("sql:" + sql); bb.writeLog("dataid:" + dataid); bb.writeLog("modeid:" + formmodeid); - if (org.apache.commons.lang.StringUtils.isNotEmpty(dataid)) - { + if (org.apache.commons.lang.StringUtils.isNotEmpty(dataid)) { mode.setNewRight(true); mode.editModeDataShare(Integer.valueOf(modedatacreater), formmodeid, Integer.parseInt(dataid)); } } - }catch (Exception e){ - bb.writeLog("e:"+e); + } catch (Exception e) { + bb.writeLog("e:" + e); } } diff --git a/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java b/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java index d69fafe3..5d534d59 100644 --- a/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java +++ b/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java @@ -5,6 +5,7 @@ import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; +import weaver.file.ImageFileManager; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; @@ -16,7 +17,6 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.List; import java.util.Map; -import java.util.zip.ZipInputStream; public class ImportOrgExcelCmd extends AbstractCommonCommand> { @@ -66,8 +66,9 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> { InputStream inputstream = null; FileOutputStream fileOutputStream = null; +// InputStream fileRealStream = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); Calendar calendar = Calendar.getInstance(); String dateTime = sdf.format(calendar.getTime()); @@ -76,25 +77,27 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> bb.writeLog("excelupload:"+excelupload); File exceluploadpath = new File(excelupload); if(!exceluploadpath.exists()){ - bb.writeLog("11111:"); - exceluploadpath.mkdir(); + boolean mkdir = exceluploadpath.mkdirs(); + bb.writeLog("11111:"+mkdir); } - + String excel_upload_path = exceluploadpath.getPath() ; try { bb.writeLog("imagefilename:"+imagefilename); if(StringUtils.isNotEmpty(imagefilename)) { - if("0".equals(iszip)){ - inputstream = new BufferedInputStream(new FileInputStream(filerealpath)); - }else{ - ZipInputStream zin = new ZipInputStream(new FileInputStream(filerealpath)); - if (zin.getNextEntry() != null) - { - inputstream = new BufferedInputStream(zin); - } - } + inputstream = ImageFileManager.getInputStreamById(Integer.valueOf(imagefileid)); + +// if("0".equals(iszip)){ +// inputstream = new BufferedInputStream(fileRealStream); +// }else{ +// ZipInputStream zin = new ZipInputStream(fileRealStream); +// +// if (zin.getNextEntry() != null) +// { +// inputstream = new BufferedInputStream(zin); +// } +// } - String excel_upload_path = exceluploadpath.getPath() ; bb.writeLog("excel_upload_path:"+excel_upload_path); String excelpath = excel_upload_path + File.separatorChar + imagefilename ; @@ -148,6 +151,7 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> ImportExcelResourceUtil importExcelResourceUtil = new ImportExcelResourceUtil(); ImportExcelDeptUtil importExcelDeptUtil = new ImportExcelDeptUtil(); ImportExcelPostUtil importExcelPostUtil = new ImportExcelPostUtil(); + ImportExcelUserPostUtil importExcelUserPostUtil = new ImportExcelUserPostUtil(); if("1".equals(type)){ @@ -166,7 +170,6 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> } }else if("2".equals(type)){ - //岗位 String jobtitlestable = "hrmjobtitles" ; String jobtitlesbaktable = "hrmjobtitles_allbak" ; @@ -193,7 +196,7 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> } }else if("4".equals(type)){ - + //角色 String hrmrolestable = "hrmroles"; String hrmrolesbaktable = "hrmroles_allbak" ; @@ -204,7 +207,8 @@ public class ImportOrgExcelCmd extends AbstractCommonCommand> isExist = importOrgExcelUtil.backupTableByData(hrmrolememberstable,hrmrolemembersbaktable); } }else if("5".equals(type)){ - + //人员岗位 + importExcelUserPostUtil.operatePostExcel(datalists); }else if("6".equals(type)){ } diff --git a/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java b/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java index 72af8df3..17a9e976 100644 --- a/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java +++ b/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java @@ -38,7 +38,7 @@ public class ImportOrgExcelUtil { boolean isExist = false; int cou = 0; String sql = " select count(*) as cou from information_schema.tables where table_name ='"+tName+"' "; - rs.executeQuery(sql,new Object[]{tName}); + rs.executeQuery(sql); if(rs.next()){ cou = Util.getIntValue(Util.null2String(rs.getString("cou"))); } diff --git a/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java b/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java index 52d88523..101444dd 100644 --- a/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java +++ b/src/weaver/interfaces/dito/mq/HrmRocketmqServlet.java @@ -72,7 +72,7 @@ public class HrmRocketmqServlet extends HttpServlet { try { // String consumerGroup = propBean.getUfPropValueStatic("consumerGroup"); // bb.writeLog("consumerGroup:" + consumerGroup); - DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_oaweaver"); + DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("portal-producer-group_oaweaver2"); // String namesrvAddr = propBean.getUfPropValueStatic("namesrvAddr"); // bb.writeLog("namesrvAddr:" + namesrvAddr); consumer.setNamesrvAddr("10.26.3.152:9306;10.26.3.151:9306;10.26.3.150:9306"); diff --git a/src/weaver/interfaces/dito/util/ReadExcel.java b/src/weaver/interfaces/dito/util/ReadExcel.java index 08bbe2d7..d8804a85 100644 --- a/src/weaver/interfaces/dito/util/ReadExcel.java +++ b/src/weaver/interfaces/dito/util/ReadExcel.java @@ -156,7 +156,7 @@ public class ReadExcel { if (Objects.nonNull(cell)) { // 把类型先设置为字符串类型 cell.setCellType(CellType.STRING); - title[i] = cell.getStringCellValue(); + title[i] = cell.getStringCellValue().toLowerCase(); } else { title[i] = ""; }