diff --git a/src/com/api/dito/excel/ImportExcelActionApi.java b/src/com/api/dito/excel/ImportExcelActionApi.java new file mode 100644 index 00000000..5d01685a --- /dev/null +++ b/src/com/api/dito/excel/ImportExcelActionApi.java @@ -0,0 +1,9 @@ +package com.api.dito.excel; + +import com.engine.dito.excel.web.ImportExcelAction; + +import javax.ws.rs.Path; + +@Path("/dito/import") +public class ImportExcelActionApi extends ImportExcelAction { +} diff --git a/src/com/cloudstore/dev/api/service/ServiceEC.java b/src/com/cloudstore/dev/api/service/ServiceEC.java index 8e73e509..c82d8866 100644 --- a/src/com/cloudstore/dev/api/service/ServiceEC.java +++ b/src/com/cloudstore/dev/api/service/ServiceEC.java @@ -17,12 +17,10 @@ import com.cloudstore.mobile.sso.util.Emobile7SsoUtil; import com.cloudstore.mobile.sso.util.TokenStore; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.ditoSsologin.service.MobileSsoLoginService; -import com.engine.ditoSsologin.service.impl.MobileSsoLoginServiceImpl; +import com.engine.dito.ssologin.service.MobileSsoLoginService; +import com.engine.dito.ssologin.service.impl.MobileSsoLoginServiceImpl; import com.engine.msgcenter.bean.WeaVavleType; import com.engine.msgcenter.util.ValveConfigManager; -import com.engine.organization.service.DepartmentService; -import com.engine.organization.service.impl.DepartmentServiceImpl; import com.engine.systeminfo.util.AppSyncUtil; import com.engine.systeminfo.util.IpTablesUtil; import com.google.common.collect.Maps; @@ -31,15 +29,9 @@ import java.io.*; import java.net.URL; import java.net.URLConnection; import java.net.URLDecoder; -import java.security.Principal; import java.util.*; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -47,7 +39,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import weaver.common.util.string.StringUtil; diff --git a/src/com/customization/sendtodo/HttpReqUtils.java b/src/com/customization/dito/sendtodo/HttpReqUtils.java similarity index 97% rename from src/com/customization/sendtodo/HttpReqUtils.java rename to src/com/customization/dito/sendtodo/HttpReqUtils.java index b2b473da..384d22d8 100644 --- a/src/com/customization/sendtodo/HttpReqUtils.java +++ b/src/com/customization/dito/sendtodo/HttpReqUtils.java @@ -1,4 +1,4 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import com.sun.jersey.core.util.Base64; import okhttp3.*; diff --git a/src/com/customization/sendtodo/HttpRequestUtil.java b/src/com/customization/dito/sendtodo/HttpRequestUtil.java similarity index 97% rename from src/com/customization/sendtodo/HttpRequestUtil.java rename to src/com/customization/dito/sendtodo/HttpRequestUtil.java index 1a57aac8..a9e62757 100644 --- a/src/com/customization/sendtodo/HttpRequestUtil.java +++ b/src/com/customization/dito/sendtodo/HttpRequestUtil.java @@ -1,4 +1,4 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import com.sun.jersey.core.util.Base64; import okhttp3.*; diff --git a/src/com/customization/sendtodo/SendMailUtil.java b/src/com/customization/dito/sendtodo/SendMailUtil.java similarity index 98% rename from src/com/customization/sendtodo/SendMailUtil.java rename to src/com/customization/dito/sendtodo/SendMailUtil.java index a1ceef3e..2a5a1f8a 100644 --- a/src/com/customization/sendtodo/SendMailUtil.java +++ b/src/com/customization/dito/sendtodo/SendMailUtil.java @@ -1,11 +1,11 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import com.alibaba.fastjson.JSONObject; import okhttp3.*; import org.apache.commons.lang.StringUtils; import weaver.general.BaseBean; -import weaver.interfaces.comInfo.PropBean; -import weaver.interfaces.iwhalecloud.util.RSAUtils; +import weaver.interfaces.dito.comInfo.PropBean; +import weaver.interfaces.dito.util.RSAUtils; import java.io.IOException; import java.text.SimpleDateFormat; diff --git a/src/com/customization/sendtodo/SendPortalDoneUtil.java b/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java similarity index 99% rename from src/com/customization/sendtodo/SendPortalDoneUtil.java rename to src/com/customization/dito/sendtodo/SendPortalDoneUtil.java index c6ce3d03..465b34d3 100644 --- a/src/com/customization/sendtodo/SendPortalDoneUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java @@ -1,4 +1,4 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -7,7 +7,7 @@ import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import java.net.URLEncoder; diff --git a/src/com/customization/sendtodo/SendPortalErrorUtil.java b/src/com/customization/dito/sendtodo/SendPortalErrorUtil.java similarity index 90% rename from src/com/customization/sendtodo/SendPortalErrorUtil.java rename to src/com/customization/dito/sendtodo/SendPortalErrorUtil.java index d1abd28d..8a2a22df 100644 --- a/src/com/customization/sendtodo/SendPortalErrorUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalErrorUtil.java @@ -1,4 +1,4 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import weaver.general.BaseBean; diff --git a/src/com/customization/sendtodo/SendPortalTodoCmd.java b/src/com/customization/dito/sendtodo/SendPortalTodoCmd.java similarity index 97% rename from src/com/customization/sendtodo/SendPortalTodoCmd.java rename to src/com/customization/dito/sendtodo/SendPortalTodoCmd.java index 54fb018d..91051f76 100644 --- a/src/com/customization/sendtodo/SendPortalTodoCmd.java +++ b/src/com/customization/dito/sendtodo/SendPortalTodoCmd.java @@ -1,6 +1,5 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; -import com.engine.common.util.ParamUtil; import com.engine.core.cfg.annotation.CommandDynamicProxy; import com.engine.core.interceptor.AbstractCommandProxy; import com.engine.core.interceptor.Command; diff --git a/src/com/customization/sendtodo/SendPortalTodoRunnable.java b/src/com/customization/dito/sendtodo/SendPortalTodoRunnable.java similarity index 96% rename from src/com/customization/sendtodo/SendPortalTodoRunnable.java rename to src/com/customization/dito/sendtodo/SendPortalTodoRunnable.java index c26fec3d..97e5e045 100644 --- a/src/com/customization/sendtodo/SendPortalTodoRunnable.java +++ b/src/com/customization/dito/sendtodo/SendPortalTodoRunnable.java @@ -1,9 +1,8 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; -import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; public class SendPortalTodoRunnable implements Runnable{ diff --git a/src/com/customization/sendtodo/SendPortalTodoUtil.java b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java similarity index 99% rename from src/com/customization/sendtodo/SendPortalTodoUtil.java rename to src/com/customization/dito/sendtodo/SendPortalTodoUtil.java index a063d2ad..0c285d21 100644 --- a/src/com/customization/sendtodo/SendPortalTodoUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java @@ -1,4 +1,4 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/com/customization/sendtodo/SendRemarkOperateTodoCmd.java b/src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java similarity index 99% rename from src/com/customization/sendtodo/SendRemarkOperateTodoCmd.java rename to src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java index 7ddd89d8..de7e5be6 100644 --- a/src/com/customization/sendtodo/SendRemarkOperateTodoCmd.java +++ b/src/com/customization/dito/sendtodo/SendRemarkOperateTodoCmd.java @@ -1,4 +1,4 @@ -package com.customization.sendtodo; +package com.customization.dito.sendtodo; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -6,13 +6,12 @@ import com.engine.core.cfg.annotation.CommandDynamicProxy; import com.engine.core.interceptor.AbstractCommandProxy; import com.engine.core.interceptor.Command; import com.engine.workflow.cmd.requestForm.ForwardSubmitCmd; -import org.docx4j.wml.U; import weaver.conn.RecordSet; import weaver.file.FileUpload; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import javax.servlet.http.HttpServletRequest; import java.util.Map; diff --git a/src/com/engine/dito/excel/cmd/ImportExcelDeptUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelDeptUtil.java new file mode 100644 index 00000000..cd299d14 --- /dev/null +++ b/src/com/engine/dito/excel/cmd/ImportExcelDeptUtil.java @@ -0,0 +1,164 @@ +package com.engine.dito.excel.cmd; + +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; +import weaver.general.BaseBean; +import weaver.general.Util; +import weaver.interfaces.dito.comInfo.PropBean; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +public class ImportExcelDeptUtil { + + + /*** + * + * @param datalists + */ + public void operateHrmdepartmentExcel(List> datalists) + { + + int scount = 0; + int fcount = 0; + for (int i = 0; i < datalists.size(); i++) + { + Map m = datalists.get(i); + m.forEach((key, value) -> { + System.out.println(key + ":" + value); + }); + int ORG_LEVEL = Util.getIntValue(m.get("org_level")); + String ORG_ID = m.get("org_id"); + + String ORG_TYPE = m.get("org_type"); + String PARENT_ORG_ID = m.get("parent_org_id"); + String ORG_CODE = m.get("org_code"); + String ORG_NAME = m.get("org_name"); + + //状态正常 + String canceled = ""; + + //一级部门 + if (ORG_LEVEL == 1) { + String subcompany = PropBean.getUfPropValue("excel.subcompany"); //"59"; + String supdepid = PropBean.getUfPropValue("excel.supdepid"); //0; + boolean flag = insertDepartment(ORG_NAME, ORG_CODE, canceled, subcompany, supdepid, ORG_ID); + if (flag) { + scount++; + } else { + fcount++; + } + } + + //下及部门 + if (ORG_LEVEL > 1) { + Map map = new HashMap(); + map = getSubcompanyid1(datalists, PARENT_ORG_ID); + String subcompany = map.get("subcompanyid1"); + String supdepid = map.get("supdepid"); + boolean flag = insertDepartment(ORG_NAME, ORG_CODE, canceled, subcompany, supdepid, ORG_ID); + if (flag) { + scount++; + } else { + fcount++; + } + } + } + } + + + /*** + * + * @param lists + * @param id + * @return + */ + private Map getSubcompanyid1(List> lists, String id) { + Map res = new HashMap<>(); + RecordSet rs = new RecordSet(); + String subcompanyid1 = ""; + String supdepid = ""; + for (int i = 0; i < lists.size(); i++) { + Map m = lists.get(i); + String ORG_ID = m.get("org_id"); + + String ORG_CODE = m.get("org_code"); + + if (ORG_ID.equals(id)) { + rs.execute("select id,subcompanyid1 from hrmdepartment where departmentcode = '" + ORG_CODE + "'"); + while (rs.next()) { + supdepid = Util.null2String(rs.getString("id")); + subcompanyid1 = Util.null2String(rs.getString("subcompanyid1")); + res.put("supdepid", supdepid); + res.put("subcompanyid1", subcompanyid1); + } + } + } + return res; + } + + /*** + * + * @param ORG_NAME + * @param ORG_CODE + * @param canceled + * @param subcompanyid1 + * @param supdepid + * @param ORG_ID + * @return + */ + private boolean insertDepartment(String ORG_NAME, String ORG_CODE, String canceled, String subcompanyid1, String supdepid, String ORG_ID) { + RecordSet rs = new RecordSet(); + boolean flag = false; + BaseBean bb = new BaseBean(); + String deptid = "" ; + String sql = "select id from hrmdepartment where departmentcode = ?"; + rs.executeQuery(sql,ORG_CODE); + if (rs.next()){ + deptid = Util.null2String(rs.getString("id")); + } + if(StringUtils.isEmpty(deptid)){ + String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," + + " subcompanyid1=?,showorder=?, supdepid=? where id = ? "; + + flag = rs.executeUpdate(deptUpdateSql,new Object[]{ORG_NAME,ORG_NAME,canceled,subcompanyid1,ORG_ID,supdepid,deptid}); + + }else{ + String deptInsertSql = " insert into hrmdepartment(departmentmark,departmentname,departmentcode," + + " canceled,subcompanyid1,supdepid,showorder) values(?,?,?,?,?,?,?) "; + flag = rs.executeUpdate(deptInsertSql, new Object[]{ORG_NAME, ORG_NAME, ORG_CODE, canceled, subcompanyid1, supdepid, ORG_ID}); + if(flag){ + sql = "select id from hrmdepartment where departmentcode = ?"; + rs.executeQuery(sql,ORG_CODE); + if (rs.next()){ + deptid = Util.null2String(rs.getString("id")); + } + } + } + + if(flag){ + String departmentdefinedid = "" ; + sql = " select id from hrmdepartmentdefined where deptid= ?"; + rs.executeQuery(sql,new Object[]{deptid}); + if (rs.next()){ + departmentdefinedid = Util.null2String(rs.getString("id")); + } + bb.writeLog("departmentdefinedid:"+departmentdefinedid); + if(StringUtils.isNotEmpty(departmentdefinedid)){ + sql = " update hrmdepartmentdefined set orgid = ? where deptid = ?" ; + bb.writeLog("sql:"+sql); + rs.executeUpdate(sql,new Object[]{ORG_ID,deptid}); + }else{ + sql = " insert into hrmdepartmentdefined(deptid,orgid) values(?,?) " ; + bb.writeLog("sql:"+sql); + rs.executeUpdate(sql,new Object[]{deptid,ORG_ID}); + } + } + + return flag; + } + + +} diff --git a/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java new file mode 100644 index 00000000..8f4ed223 --- /dev/null +++ b/src/com/engine/dito/excel/cmd/ImportExcelPostUtil.java @@ -0,0 +1,103 @@ +package com.engine.dito.excel.cmd; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import weaver.conn.RecordSet; +import weaver.general.TimeUtil; +import weaver.general.Util; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + + +public class ImportExcelPostUtil { + + private final static Logger logger = LoggerFactory.getLogger(ImportExcelPostUtil.class); + + /*** + * + * @param datalists + */ + public void operatePostExcel(List> datalists) + { + int scount = 0; + int fcount = 0; + + String creater = "1"; + String created = TimeUtil.getCurrentTimeString(); + String modified = TimeUtil.getCurrentTimeString(); + String modifier = "1"; + + + for (int i = 0; i < datalists.size(); i++) { + Map m = datalists.get(i); + String SYS_POST_CODE = Util.null2String(m.get("SYS_POST_CODE")); + String SYS_POST_NAME = Util.null2String(m.get("SYS_POST_NAME")); + String IS_SYNC = Util.null2String(m.get("IS_SYNC")); + if (!"YES".equals(IS_SYNC)) { + continue; + } + String allname = SYS_POST_NAME; + String ORG_ID = Util.null2String(m.get("ORG_ID")); + Map res = getSubcompanyid1(ORG_ID); + String deptid = Util.null2String(res.get("deptid")); + + boolean flag = insertPost(allname, creater, created, modified, modifier, SYS_POST_CODE, deptid); + if (flag) { + scount++; + } else { + fcount++; + } + } + } + + + + + private boolean insertPost(String jobtitlename, String creater, String created, String modified, String modifier, String sysPostCode, String departmentId) { + RecordSet rs = new RecordSet(); + String jobactivitiesid = "233"; + + boolean iflag = false; + String jobtitlesid = ""; + String sql = "select id from hrmjobtitles where jobtitlecode = ?"; + rs.executeQuery(sql,new Object[]{sysPostCode}); + while (rs.next()){ + jobtitlesid = Util.null2String(rs.getString("id")); + } + if(StringUtils.isNotEmpty(jobtitlesid)){ + String updateHrmjobactivitiesSl = "update hrmjobtitles set jobtitlemark=?,jobtitlename=?,modified=?,modifier=? where id=?"; + iflag = rs.executeUpdate(updateHrmjobactivitiesSl,jobtitlename,jobtitlename,modified,modifier,jobtitlesid); + + }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[]{jobtitlename, jobtitlename, jobactivitiesid, departmentId, sysPostCode, created, creater, modified, modifier, uuid}); + + } + return iflag; + } + + /*** + * + * @param ORG_ID + * @return + */ + 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 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")); + res.put("deptid", deptid); + res.put("subcompanyid1", subcompanyid1); + } + return res; + } + +} diff --git a/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java new file mode 100644 index 00000000..5bb66807 --- /dev/null +++ b/src/com/engine/dito/excel/cmd/ImportExcelResourceUtil.java @@ -0,0 +1,152 @@ +package com.engine.dito.excel.cmd; + +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; +import weaver.general.TimeUtil; +import weaver.general.Util; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class ImportExcelResourceUtil { + + private final static Logger logger = LoggerFactory.getLogger(ImportExcelResourceUtil.class); + + /*** + * + * @param datalists + */ + public void operateHrmdepartmentExcel(List> datalists) + { + int scount = 0; + int fcount = 0; + for (int i = 0; i < datalists.size(); i++) { + Map h = datalists.get(i); + //部门id + String ORG_ID = Util.null2String(h.get("org_id")); + String STAFF_CODE = Util.null2String(h.get("staff_code")); + String systemlanguage = "8" ; + String locationid = "2" ; + String seclevel = "20" ; + String createrid = "1" ; + String lastmodid = "1" ; + + String pwd = "1"; + String creator = "1"; + String jobTitleId = "464"; + + String currentDate = TimeUtil.getCurrentDateString();//当前日期 + String currentDateTime = TimeUtil.getCurrentTimeString(); //当前时间 + + String password = DigestUtils.md5Hex(pwd).toUpperCase(); //MD5加密 + + String STAFF_ID = Util.null2String(h.get("staff_id")); + String STAFF_NAME = Util.null2String(h.get("staff_name")); + String E_MAIL = Util.null2String(h.get("e_mail")); + String MOBILE_PHONE = Util.null2String(h.get("mobile_phone")); + String STATUS_CD = Util.null2String(h.get("status_cd")); + String status = "1"; + if("1100".equals(STATUS_CD) || "1200".equals(STATUS_CD) || "1300".equals(STATUS_CD)){ + status = "5"; + } + + Map res = getSubcompanyid1(ORG_ID); + String deptId = Util.null2String(res.get("deptid")); + String subcompanyid1 = Util.null2String(res.get("subcompanyid1")); + if(StringUtils.isEmpty(deptId)) continue; + + boolean flag = insertHrmresource( STAFF_CODE, password, STAFF_NAME, deptId, subcompanyid1, creator, E_MAIL, MOBILE_PHONE, jobTitleId, status, + STAFF_ID, systemlanguage, currentDate, currentDateTime, locationid, seclevel, createrid, lastmodid); + if(flag){ + scount++; + }else{ + fcount++; + } + } + + } + + /*** + * + * @param ORG_ID + * @return + */ + 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 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")); + res.put("deptid", deptid); + res.put("subcompanyid1", subcompanyid1); + } + return res; + } + + /*** + * + * @param STAFF_CODE + * @param password + * @param STAFF_NAME + * @param deptId + * @param subcompanyid1 + * @param creator + * @param E_MAIL + * @param MOBILE_PHONE + * @param jobTitleId + * @param status + * @param STAFF_ID + * @param systemlanguage + * @param currentDate + * @param currentDateTime + * @param locationid + * @param seclevel + * @param createrid + * @param lastmodid + * @return + */ + private boolean insertHrmresource(String STAFF_CODE,String password,String STAFF_NAME,String deptId,String subcompanyid1,String creator,String E_MAIL,String MOBILE_PHONE,String jobTitleId,String status, + String STAFF_ID,String systemlanguage,String currentDate,String currentDateTime,String locationid,String seclevel,String createrid,String lastmodid) { + RecordSet rs = new RecordSet(); + boolean flag = false; + String loginid = ""; + String sql = " select loginid from hrmresource where workcode=?" ; + + rs.executeQuery(sql,new Object[]{STAFF_CODE}); + if(rs.next()){ + loginid = Util.null2String(rs.getString("loginid")); + } + + if(!"".equals(loginid)){ + String userUpdateSql = " update hrmresource set lastname=?,departmentid=?,subcompanyid1=?," + + " creater=?,email=?,mobile=?,jobtitle=?,status=?,dsporder=?,lastmoddate=?,modified=? where workcode=? "; + + + flag = rs.executeUpdate(userUpdateSql,new Object[]{STAFF_NAME,deptId,subcompanyid1,creator,E_MAIL, + MOBILE_PHONE,jobTitleId,status,STAFF_ID,currentDate,currentDateTime,STAFF_CODE}); + + }else{ + rs.executeProc("HrmResourceMaxId_Get", ""); + rs.next(); + String id = "" + rs.getInt(1); + String userInsertSql = " insert into hrmresource(id,loginid,password,workcode,lastname,departmentid,subcompanyid1," + + "creater,email,mobile,jobtitle,status,dsporder,systemlanguage,createdate,lastmoddate,created,modified," + + "locationid,seclevel,createrid,lastmodid) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + flag = rs.executeUpdate(userInsertSql,new Object[]{id,STAFF_CODE,password,STAFF_CODE,STAFF_NAME,deptId,subcompanyid1, + creator,E_MAIL,MOBILE_PHONE,jobTitleId,status,STAFF_ID,systemlanguage,currentDate,currentDate,currentDateTime,currentDateTime, + locationid,seclevel,createrid,lastmodid}); + } + return flag; + } + + +} diff --git a/src/com/engine/dito/excel/cmd/ImportExcelRoleUtil.java b/src/com/engine/dito/excel/cmd/ImportExcelRoleUtil.java new file mode 100644 index 00000000..131dcad5 --- /dev/null +++ b/src/com/engine/dito/excel/cmd/ImportExcelRoleUtil.java @@ -0,0 +1,189 @@ +package com.engine.dito.excel.cmd; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import weaver.conn.RecordSet; +import weaver.general.Util; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + + +public class ImportExcelRoleUtil { + + private final static Logger logger = LoggerFactory.getLogger(ImportExcelRoleUtil.class); + + /*** + * + * @param datalists + */ + public void operateRoleExcel(List> datalists) + { + int scount = 0; + int fcount = 0; + for (int i = 0; i < datalists.size(); i++) { + Map m = datalists.get(i); + String SYS_ROLE_CODE = Util.null2String(m.get("SYS_ROLE_CODE")); + String SYS_ROLE_NAME = Util.null2String(m.get("SYS_ROLE_NAME")); + String IS_SYNC = Util.null2String(m.get("IS_SYNC")); + if(!"YES".equals(IS_SYNC)){ + continue; + } + boolean flag = insertRole(SYS_ROLE_CODE, SYS_ROLE_NAME); + if (flag) { + scount++; + } else { + fcount++; + } + } + } + + /*** + * + * @param sysRoleCode + * @param sysRoleName + * @return + */ + private boolean insertRole(String sysRoleCode, String sysRoleName) { + boolean flag = false; + RecordSet rs = new RecordSet(); + String rolesmark = sysRoleName; + String rolesname = sysRoleName; + String type = "0"; + String subcompanyid = "0"; + String uuid = UUID.randomUUID().toString(); + String queryRoleSql = "select id from hrmroles where ecology_pinyin_search=?"; + rs.executeQuery(queryRoleSql, sysRoleCode); + String id = ""; + if (rs.next()) { + id = rs.getString("id"); + } + if (StringUtils.isEmpty(id)) { + String insertHrmrolesSql = " insert into hrmroles(rolesmark,rolesname,type,subcompanyid,ecology_pinyin_search,uuid) values(?,?,?,?,?,?)"; + flag = rs.executeUpdate(insertHrmrolesSql, new Object[]{rolesmark, rolesname, type, subcompanyid, sysRoleCode, uuid}); + } else { + String updateHrmrolesSql = " update hrmroles set rolesmark=?,rolesname=? where id=?"; + flag = rs.executeUpdate(updateHrmrolesSql, sysRoleName, sysRoleName, id); + } + return flag; + } + + + /*** + * + * @param datalists + */ + public void operateUserRoleExcel(List> datalists) + { + +// for (int i = 0; i < datalists.size(); i++) { +// Map m = datalists.get(i); +// String SYS_ROLE_ID = Util.null2String(m.get("SYS_ROLE_ID")); +// String SYS_USER_ID = Util.null2String(m.get("SYS_USER_ID")); +// String SYS_ROLE_CODE = getRoleCode(rolelists,SYS_ROLE_ID); +// String SYS_USER_CODE = getUserCode(userlists,SYS_USER_ID); +// if (!"".equals(SYS_ROLE_CODE) && !"".equals(SYS_USER_CODE)) { +// boolean flag = insertRoleUser(SYS_ROLE_CODE, SYS_USER_CODE); +// if (flag) { +// scount++; +// } else { +// fcount++; +// } +// } +// +// } + + } + + + private boolean insertRoleUser(String systemUserCode, String roleCode) { + boolean flag = false; + RecordSet rs = new RecordSet(); + + String userId = ""; + String roleId = ""; + String rolelevel = "2"; //总部=2;分部=1;部门=0 + String resourcetype = "1"; //1=人力资源 + + + String sql = " select id from hrmresource where loginid=?"; + rs.executeQuery(sql, new Object[]{systemUserCode}); + if (rs.next()) { + userId = Util.null2String(rs.getString("id")); + } + String queryRoleIdSql = "select id from hrmroles where ecology_pinyin_search=?"; + rs.executeQuery(queryRoleIdSql, roleCode); + if (rs.next()) { + roleId = rs.getString("id"); + } + + if (!"".equals(userId) && !"".equals(roleId)) { + //查看是否已存在角色用户关系 + String releationId = ""; + String ifExistSql = "select id from hrmrolemembers where roleid=? and resourceid=?"; + rs.executeQuery(ifExistSql, roleId, userId); + if (rs.next()) { + releationId = rs.getString("id"); + } + + if (!"".equals(releationId)) { + + String delHrmrolemembersSql = " delete from hrmrolemembers where id = ?"; + flag = rs.executeUpdate(delHrmrolemembersSql, releationId); + + } else { + + String insertHrmrolemembersSql = "insert into hrmrolemembers(roleid,resourceid,rolelevel,resourcetype,uuid) values(?,?,?,?,?)"; + flag = rs.executeUpdate(insertHrmrolemembersSql, roleId, userId, rolelevel, resourcetype, UUID.randomUUID().toString()); + + } + } + return flag; + } + + + /*** + * + * @param userid + * @return + */ + private String getUserCode(String userid) { + String workcode = ""; + String scopeid = "-1"; + String scope = "HrmCustomFieldByInfoType" ; + RecordSet rs = new RecordSet(); + String sql =" select * from cus_fielddata cf \n" + + " inner join hrmresource h on h.id = cf.ID \n" + + " where cf.SCOPE = ? \n" + + " and cf.SCOPEID = ? \n" + + " and cf.field0 = ? " ; + rs.executeQuery(sql,new Object[]{scope,scopeid,userid}); + if(rs.next()){ + workcode = Util.null2String(rs.getString("workcode")); + } + return workcode; + } + + + + + private String getRoleCode(String id) { + String code = ""; +// RecordSet rs = new RecordSet(); +// for (int i = 0; i < lists.size(); i++) { +// Map m = lists.get(i); +// String SYS_ROLE_ID = Util.null2String(m.get("SYS_ROLE_ID")); +// String SYS_ROLE_CODE = Util.null2String(m.get("SYS_ROLE_CODE")); +// if (SYS_ROLE_ID.equals(id)) { +// code= SYS_ROLE_CODE; +// } +// } + return code; + } + + + + +} diff --git a/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java b/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java new file mode 100644 index 00000000..0caff135 --- /dev/null +++ b/src/com/engine/dito/excel/cmd/ImportOrgExcelCmd.java @@ -0,0 +1,184 @@ +package com.engine.dito.excel.cmd; + +import com.engine.common.biz.AbstractCommonCommand; +import com.engine.common.entity.BizLogContext; +import com.engine.core.interceptor.CommandContext; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.dito.comInfo.PropBean; +import weaver.interfaces.dito.util.ReadExcel; + +import java.io.*; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipInputStream; + + +@Slf4j +public class ImportOrgExcelCmd extends AbstractCommonCommand> { + + public ImportOrgExcelCmd(Map params, User user) { + this.params = params; + this.user = user; + } + + @Override + public BizLogContext getLogContext() { + return null; + } + + @Override + public Map execute(CommandContext commandContext) { + this.bofore(); + return null; + } + + public void bofore(){ + + + ReadExcel readExcel = new ReadExcel(); + RecordSet rs = new RecordSet(); + String imagefileid = Util.null2String(this.params.get("imagefileid")); + String type = Util.null2String(this.params.get("type")); + + if(StringUtils.isNotEmpty(imagefileid) && StringUtils.isNotEmpty(type)){ + + String imagefilename = "" ; + String filerealpath = "" ; + String iszip = "" ; + String sql = " select i.imagefilename,i.filerealpath,i.iszip from imagefile i where i.imagefileid = ? " ; + rs.executeQuery(sql,new Object[]{imagefileid}); + if(rs.next()){ + imagefilename = Util.null2String(rs.getString("imagefilename")); + filerealpath = Util.null2String(rs.getString("filerealpath")); + iszip = Util.null2String(rs.getString("iszip")); + } + + if(StringUtils.isNotEmpty(filerealpath) && StringUtils.isNotEmpty(iszip)){ + + InputStream inputstream = null; + ZipInputStream zin = null; + FileOutputStream fileOutputStream = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + Calendar calendar = Calendar.getInstance(); + String dateTime = sdf.format(calendar.getTime()); + + + String ecology_app_root = PropBean.getUfPropValue("ecology_app_root"); + String excelupload = ecology_app_root + File.separatorChar +"filesystem"+File.separatorChar+"excelupload"+File.separatorChar+dateTime ; + File exceluploadpath = new File(excelupload); + if(!exceluploadpath.exists()){ + exceluploadpath.mkdir(); + } + + try { + if ("0".equals(iszip)){ + inputstream = new BufferedInputStream(new FileInputStream(filerealpath)); + }else{ + zin = new ZipInputStream(new FileInputStream(filerealpath)); + if (zin.getNextEntry() != null) + { + inputstream = new BufferedInputStream(zin); + } + } + + if(StringUtils.isNotEmpty(imagefilename)) + { + String excel_upload_path = exceluploadpath.getPath() ; + String excelpath = excel_upload_path + File.separatorChar + imagefilename ; + int byteread; + byte bydata[] = new byte[8*1024]; + fileOutputStream = new FileOutputStream(new File(excelpath)) ; + while((byteread = inputstream.read(bydata)) != -1) { + fileOutputStream.write(bydata, 0, byteread); + fileOutputStream.flush() ; + } + + List> datalists = readExcel.readExcel(excel_upload_path, imagefilename, 0, 0, 0); + operateExcel(type,datalists); + + } + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + } + } + } + + + public void operateExcel(String type,List> datalists){ + + ImportOrgExcelUtil importOrgExcelUtil = new ImportOrgExcelUtil(); + + if("1".equals(type)){ + //部门 + String departmenttable = "hrmdepartment" ; + String departmentbaktable = "hrmdepartment_allbak" ; + String departmentdefinedtable = "hrmdepartmentdefined" ; + String departmentdefinedbaktable = "hrmdepartmentdefined_allbak" ; + + boolean isExist = importOrgExcelUtil.backupTableByData(departmenttable,departmentbaktable); + if(isExist){ + isExist = importOrgExcelUtil.backupTableByData(departmentdefinedtable,departmentdefinedbaktable); + } + + if(isExist){ + + } + + }else if("2".equals(type)){ + + //岗位 + String jobtitlestable = "hrmjobtitles" ; + String jobtitlesbaktable = "hrmjobtitles_allbak" ; + boolean isExist = importOrgExcelUtil.backupTableByData(jobtitlestable,jobtitlesbaktable); + if(isExist){ + + } + + }else if("3".equals(type)){ + //人员 + String jobtitlestable = "hrmresource" ; + String jobtitlesbaktable = "hrmresource_allbak" ; + + String cusfielddatatable = "cus_fielddata"; + String cusfielddatatabakble = "cus_fielddata_allbak" ; + + boolean isExist = importOrgExcelUtil.backupTableByData(jobtitlestable,jobtitlesbaktable); + if(isExist){ + isExist = importOrgExcelUtil.backupTableByData(cusfielddatatable,cusfielddatatabakble); + } + + + }else if("4".equals(type)){ + + String hrmrolestable = "hrmroles"; + String hrmrolesbaktable = "hrmroles_allbak" ; + + String hrmrolememberstable = "hrmrolemembers"; + String hrmrolemembersbaktable = "hrmrolemembers_allbak" ; + boolean isExist = importOrgExcelUtil.backupTableByData(hrmrolestable,hrmrolesbaktable); + if(isExist){ + isExist = importOrgExcelUtil.backupTableByData(hrmrolememberstable,hrmrolemembersbaktable); + } + }else if("5".equals(type)){ + + }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 new file mode 100644 index 00000000..e9a9a8dd --- /dev/null +++ b/src/com/engine/dito/excel/cmd/ImportOrgExcelUtil.java @@ -0,0 +1,49 @@ +package com.engine.dito.excel.cmd; + +import lombok.extern.slf4j.Slf4j; +import weaver.conn.RecordSet; + +@Slf4j +public class ImportOrgExcelUtil { + + + public boolean backupTableByData(String tName,String bName){ + RecordSet rs = new RecordSet(); + boolean isExist = checkTableIsExist(bName); + if(!isExist){ + String sql = " create table "+bName+" select * from "+tName ; + isExist = rs.executeUpdate(sql); + } + if(isExist){ + String sql = " delete from "+bName ; + isExist = rs.executeUpdate(sql); + if(isExist){ + sql = " insert into "+bName+" select * from "+tName ; + isExist = rs.executeUpdate(sql); + } + } + + return isExist; + } + + + + /** + * + * 判断表是否存在 + * 关键语句: SHOW TABLES IN DB_DZJ_DGM WHERE Tables_in_DB_DZJ_DGM = ? + * SHOW TABLES IN + DB_NAME(数据库名) 查看目标库中所有的表名 + * WHERE Tables_in_DB_DZJ_DGM = '查询目标（表名）' + */ + public boolean checkTableIsExist(String tName){ + RecordSet rs = new RecordSet(); + boolean isExist = false; + String sql = "SHOW TABLES IN DB_DZJ_DGM WHERE Tables_in_DB_DZJ_DGM = ?"; + rs.executeQuery(sql,new Object[]{tName}); + if(rs.next()){ + isExist = true; + } + return isExist; + } + +} diff --git a/src/com/engine/dito/excel/service/ImportExcelService.java b/src/com/engine/dito/excel/service/ImportExcelService.java new file mode 100644 index 00000000..9277e34d --- /dev/null +++ b/src/com/engine/dito/excel/service/ImportExcelService.java @@ -0,0 +1,11 @@ +package com.engine.dito.excel.service; + +import weaver.hrm.User; + +import java.util.Map; + +public interface ImportExcelService { + + Map importOrgExcel(Map datas,User user); + +} diff --git a/src/com/engine/dito/excel/service/impl/ImportExcelServiceImpl.java b/src/com/engine/dito/excel/service/impl/ImportExcelServiceImpl.java new file mode 100644 index 00000000..af531c47 --- /dev/null +++ b/src/com/engine/dito/excel/service/impl/ImportExcelServiceImpl.java @@ -0,0 +1,15 @@ +package com.engine.dito.excel.service.impl; + +import com.engine.dito.excel.cmd.ImportOrgExcelCmd; +import com.engine.dito.excel.service.ImportExcelService; +import weaver.hrm.User; +import com.engine.core.impl.Service; +import java.util.Map; + +public class ImportExcelServiceImpl extends Service implements ImportExcelService { + + @Override + public Map importOrgExcel(Map datas, User user) { + return commandExecutor.execute(new ImportOrgExcelCmd(datas,user)); + } +} diff --git a/src/com/engine/dito/excel/web/ImportExcelAction.java b/src/com/engine/dito/excel/web/ImportExcelAction.java new file mode 100644 index 00000000..b95c3aa5 --- /dev/null +++ b/src/com/engine/dito/excel/web/ImportExcelAction.java @@ -0,0 +1,49 @@ +package com.engine.dito.excel.web; + +import com.alibaba.fastjson.JSONObject; +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; +import com.engine.dito.excel.service.ImportExcelService; +import com.engine.dito.excel.service.impl.ImportExcelServiceImpl; +import weaver.general.BaseBean; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +public class ImportExcelAction { + + public ImportExcelService getService(){ + return (ImportExcelService) ServiceUtil.getService(ImportExcelServiceImpl.class); + } + + + @GET + @Path("/orgexcel") + @Produces({MediaType.TEXT_PLAIN}) + public String importOrgExcel(@Context HttpServletRequest request, @Context HttpServletResponse response) { + BaseBean bb = new BaseBean(); + bb.writeLog("importExcel"); + Map apidatas = new HashMap(); + try{ + User user = HrmUserVarify.getUser(request, response); + Map dataMap = ParamUtil.request2Map(request); + apidatas.putAll(getService().importOrgExcel(dataMap,user)); + apidatas.put("api_status",true); + }catch (Exception e){ + apidatas.put("api_status",false); + apidatas.put("api_errormsg","exception:"+e.getMessage()); + } + bb.writeLog("apidatas:"+ JSONObject.toJSONString(apidatas)); + return JSONObject.toJSONString(apidatas); + + } +} diff --git a/src/com/engine/ditoSsologin/constant/DitoConstant.java b/src/com/engine/dito/ssologin/constant/DitoConstant.java similarity index 97% rename from src/com/engine/ditoSsologin/constant/DitoConstant.java rename to src/com/engine/dito/ssologin/constant/DitoConstant.java index 7fd3cf91..88d5a5a3 100644 --- a/src/com/engine/ditoSsologin/constant/DitoConstant.java +++ b/src/com/engine/dito/ssologin/constant/DitoConstant.java @@ -1,4 +1,4 @@ -package com.engine.ditoSsologin.constant; +package com.engine.dito.ssologin.constant; /** * @version 1.0 diff --git a/src/com/engine/ditoSsologin/service/MobileSsoLoginService.java b/src/com/engine/dito/ssologin/service/MobileSsoLoginService.java similarity index 94% rename from src/com/engine/ditoSsologin/service/MobileSsoLoginService.java rename to src/com/engine/dito/ssologin/service/MobileSsoLoginService.java index 5b916ce2..a11fad79 100644 --- a/src/com/engine/ditoSsologin/service/MobileSsoLoginService.java +++ b/src/com/engine/dito/ssologin/service/MobileSsoLoginService.java @@ -1,4 +1,4 @@ -package com.engine.ditoSsologin.service; +package com.engine.dito.ssologin.service; import weaver.hrm.User; diff --git a/src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java b/src/com/engine/dito/ssologin/service/impl/MobileSsoLoginServiceImpl.java similarity index 97% rename from src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java rename to src/com/engine/dito/ssologin/service/impl/MobileSsoLoginServiceImpl.java index aa96875c..cf001cdd 100644 --- a/src/com/engine/ditoSsologin/service/impl/MobileSsoLoginServiceImpl.java +++ b/src/com/engine/dito/ssologin/service/impl/MobileSsoLoginServiceImpl.java @@ -1,20 +1,20 @@ -package com.engine.ditoSsologin.service.impl; +package com.engine.dito.ssologin.service.impl; import com.alibaba.fastjson.JSONObject; import com.cloudstore.dev.api.util.Util_DataCache; import com.engine.core.impl.Service; -import com.engine.ditoSsologin.service.MobileSsoLoginService; +import com.engine.dito.ssologin.service.MobileSsoLoginService; import org.apache.commons.lang3.StringUtils; import weaver.general.BaseBean; import weaver.hrm.User; -import weaver.interfaces.comInfo.PropBean; -import weaver.interfaces.util.HttpUtils; +import weaver.interfaces.dito.comInfo.PropBean; +import weaver.interfaces.dito.util.HttpUtils; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static com.engine.ditoSsologin.constant.DitoConstant.*; +import static com.engine.dito.ssologin.constant.DitoConstant.*; /** diff --git a/src/weaver/interfaces/comInfo/PropBean.java b/src/weaver/interfaces/dito/comInfo/PropBean.java similarity index 57% rename from src/weaver/interfaces/comInfo/PropBean.java rename to src/weaver/interfaces/dito/comInfo/PropBean.java index 1b5905fd..ff73b4d5 100644 --- a/src/weaver/interfaces/comInfo/PropBean.java +++ b/src/weaver/interfaces/dito/comInfo/PropBean.java @@ -1,4 +1,4 @@ -package weaver.interfaces.comInfo; +package weaver.interfaces.dito.comInfo; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; @@ -8,39 +8,20 @@ import weaver.general.Util; public class PropBean { public static BaseBean bb = new BaseBean(); - public static String active = Util.null2String(bb.getPropValue("developProp","active")); + public static String active = Util.null2String(bb.getPropValue("developProp","active")).toUpperCase(); public static String getUfPropValue(String pkey) { - if(StringUtils.isEmpty(active)){ - return ""; - } + BaseBean baseBean = new BaseBean(); + if(StringUtils.isEmpty(pkey)){ return ""; } - String pvalue = ""; - try{ - RecordSet rs = new RecordSet(); - String sql = " SELECT DEVVALUE,TESTVALUE,PRODVALUE FROM UF_PROP WHERE PKEY = ?"; - rs.executeQuery(sql,new Object[]{pkey}); - if(rs.next()){ - pvalue = Util.null2String(rs.getString(active+"VALUE")); - } - }catch (Exception e){ - } - return pvalue; - } - - - public static String getPropValue(String pkey) - { if(StringUtils.isEmpty(active)){ - return ""; - } - if(StringUtils.isEmpty(pkey)){ - return ""; + active = Util.null2String(baseBean.getPropValue("developProp","active")).toUpperCase(); } + String pvalue = ""; try{ RecordSet rs = new RecordSet(); @@ -49,9 +30,11 @@ public class PropBean { if(rs.next()){ pvalue = Util.null2String(rs.getString(active+"VALUE")); } + baseBean.writeLog("pvalue:"+pvalue); }catch (Exception e){ } return pvalue; } + } diff --git a/src/weaver/interfaces/filter/HttpRequestUtil.java b/src/weaver/interfaces/dito/filter/HttpRequestUtil.java similarity index 99% rename from src/weaver/interfaces/filter/HttpRequestUtil.java rename to src/weaver/interfaces/dito/filter/HttpRequestUtil.java index 8a20f304..a6998e2b 100644 --- a/src/weaver/interfaces/filter/HttpRequestUtil.java +++ b/src/weaver/interfaces/dito/filter/HttpRequestUtil.java @@ -1,4 +1,4 @@ -package weaver.interfaces.filter; +package weaver.interfaces.dito.filter; import com.api.login.util.LoginUtil; import okhttp3.OkHttpClient; @@ -9,7 +9,7 @@ import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; import weaver.general.GCONST; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import weaver.login.VerifyLogin; import javax.servlet.http.Cookie; import javax.servlet.ServletContext; diff --git a/src/weaver/interfaces/filter/PortalLoginBeforeFilter.java b/src/weaver/interfaces/dito/filter/PortalLoginBeforeFilter.java similarity index 90% rename from src/weaver/interfaces/filter/PortalLoginBeforeFilter.java rename to src/weaver/interfaces/dito/filter/PortalLoginBeforeFilter.java index b1f9fc54..5a2def49 100644 --- a/src/weaver/interfaces/filter/PortalLoginBeforeFilter.java +++ b/src/weaver/interfaces/dito/filter/PortalLoginBeforeFilter.java @@ -1,11 +1,11 @@ -package weaver.interfaces.filter; +package weaver.interfaces.dito.filter; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang.StringUtils; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -41,9 +41,23 @@ public class PortalLoginBeforeFilter implements Filter { HttpServletResponse response = (HttpServletResponse) servletResponse; ServletContext application = request.getSession().getServletContext(); + if(StringUtils.isEmpty(portalUserAuth)){ + portalUserAuth = PropBean.getUfPropValue("portal_user_auth"); + } boolean isExcludedPage = false; String requestURL = request.getRequestURL().toString(); - //bb.writeLog("bpmHostList:" + bpmHostList.size()); + bb.writeLog("bpmHostList:" + bpmHostList.size()); + if(bpmHostList.isEmpty()){ + bpmHostList = new ArrayList(); + String bpm_host_array = PropBean.getUfPropValue("bpm_host_array"); + if (!"".equals(bpm_host_array)) { + String[] bpm_host_arr = bpm_host_array.split(";"); + for (int i = 0; i < bpm_host_arr.length; i++) { + bpmHostList.add(bpm_host_arr[i]); + } + } + } + if (!bpmHostList.isEmpty()) { for (String bpm_host_val : bpmHostList) { //bb.writeLog("bpm_host_val:" + bpm_host_val); @@ -98,6 +112,7 @@ public class PortalLoginBeforeFilter implements Filter { bb.writeLog("weaver_uid:"+weaver_uid); bb.writeLog("uid:"+uid); + bb.writeLog("portalUserAuth:"+portalUserAuth); if(StringUtils.isNotEmpty(weaver_uid)) { @@ -105,6 +120,7 @@ public class PortalLoginBeforeFilter implements Filter { { bb.writeLog("weaver_uid <> uid portal_status:"+portal_status); String msg = httpRequestUtil.doGetHttp(portalUserAuth,uid); + bb.writeLog("msg:"+msg); if (!"".equals(msg)) { JSONObject jsonObject = JSONObject.parseObject(msg); @@ -138,6 +154,7 @@ public class PortalLoginBeforeFilter implements Filter { }else { bb.writeLog("weaver_uid is null "); String msg = httpRequestUtil.doGetHttp(portalUserAuth,uid); + bb.writeLog("msg:"+msg); if (!"".equals(msg)) { JSONObject jsonObject = JSONObject.parseObject(msg); diff --git a/src/weaver/interfaces/filter/PortalLoginFilter.java b/src/weaver/interfaces/dito/filter/PortalLoginFilter.java similarity index 99% rename from src/weaver/interfaces/filter/PortalLoginFilter.java rename to src/weaver/interfaces/dito/filter/PortalLoginFilter.java index 9988396f..02ee257d 100644 --- a/src/weaver/interfaces/filter/PortalLoginFilter.java +++ b/src/weaver/interfaces/dito/filter/PortalLoginFilter.java @@ -1,7 +1,6 @@ -package weaver.interfaces.filter; +package weaver.interfaces.dito.filter; import com.alibaba.fastjson.JSONObject; -import com.api.login.util.LoginUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.dubbo.common.utils.StringUtils; @@ -9,7 +8,7 @@ import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; diff --git a/src/weaver/interfaces/job/DeptManagerCronJob.java b/src/weaver/interfaces/dito/job/DeptManagerCronJob.java similarity index 98% rename from src/weaver/interfaces/job/DeptManagerCronJob.java rename to src/weaver/interfaces/dito/job/DeptManagerCronJob.java index e4156d6a..6fc61248 100644 --- a/src/weaver/interfaces/job/DeptManagerCronJob.java +++ b/src/weaver/interfaces/dito/job/DeptManagerCronJob.java @@ -1,11 +1,11 @@ -package weaver.interfaces.job; +package weaver.interfaces.dito.job; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import weaver.interfaces.schedule.BaseCronJob; import java.util.*; diff --git a/src/weaver/interfaces/job/DeptManagerCronJobNew.java b/src/weaver/interfaces/dito/job/DeptManagerCronJobNew.java similarity index 99% rename from src/weaver/interfaces/job/DeptManagerCronJobNew.java rename to src/weaver/interfaces/dito/job/DeptManagerCronJobNew.java index 7bb224d7..07b05776 100644 --- a/src/weaver/interfaces/job/DeptManagerCronJobNew.java +++ b/src/weaver/interfaces/dito/job/DeptManagerCronJobNew.java @@ -1,11 +1,11 @@ -package weaver.interfaces.job; +package weaver.interfaces.dito.job; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import weaver.interfaces.schedule.BaseCronJob; import weaver.general.GCONST; diff --git a/src/weaver/interfaces/job/ESiginsCronJob.java b/src/weaver/interfaces/dito/job/ESiginsCronJob.java similarity index 99% rename from src/weaver/interfaces/job/ESiginsCronJob.java rename to src/weaver/interfaces/dito/job/ESiginsCronJob.java index 50a63226..cb7ba0a7 100644 --- a/src/weaver/interfaces/job/ESiginsCronJob.java +++ b/src/weaver/interfaces/dito/job/ESiginsCronJob.java @@ -1,4 +1,4 @@ -package weaver.interfaces.job; +package weaver.interfaces.dito.job; import com.alibaba.fastjson.JSONObject; import com.sun.jersey.core.util.Base64; @@ -11,7 +11,7 @@ import weaver.docs.docs.ImageFileIdUpdate; import weaver.general.BaseBean; import weaver.general.TimeUtil; import weaver.general.Util; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import weaver.interfaces.schedule.BaseCronJob; import java.io.*; diff --git a/src/weaver/interfaces/job/WorkflowAuthModelingCronJob.java b/src/weaver/interfaces/dito/job/WorkflowAuthModelingCronJob.java similarity index 98% rename from src/weaver/interfaces/job/WorkflowAuthModelingCronJob.java rename to src/weaver/interfaces/dito/job/WorkflowAuthModelingCronJob.java index dbca1fbb..3e3faa5b 100644 --- a/src/weaver/interfaces/job/WorkflowAuthModelingCronJob.java +++ b/src/weaver/interfaces/dito/job/WorkflowAuthModelingCronJob.java @@ -1,10 +1,7 @@ -package weaver.interfaces.job; +package weaver.interfaces.dito.job; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; -import weaver.general.Time; import weaver.general.TimeUtil; import weaver.interfaces.schedule.BaseCronJob; import weaver.share.ShareManager; diff --git a/src/weaver/interfaces/job/WorkflowSyncCronJob.java b/src/weaver/interfaces/dito/job/WorkflowSyncCronJob.java similarity index 98% rename from src/weaver/interfaces/job/WorkflowSyncCronJob.java rename to src/weaver/interfaces/dito/job/WorkflowSyncCronJob.java index c57f6bb5..b852f3d8 100644 --- a/src/weaver/interfaces/job/WorkflowSyncCronJob.java +++ b/src/weaver/interfaces/dito/job/WorkflowSyncCronJob.java @@ -1,6 +1,5 @@ -package weaver.interfaces.job; +package weaver.interfaces.dito.job; -import com.cloudstore.dev.api.service.ServiceEC; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -10,13 +9,13 @@ import weaver.conn.util.IdGenerator; import weaver.general.BaseBean; import weaver.general.TimeUtil; import weaver.general.Util; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import weaver.interfaces.schedule.BaseCronJob; -import weaver.interfaces.util.HttpUtils; +import weaver.interfaces.dito.util.HttpUtils; import java.util.*; -import static com.engine.ditoSsologin.constant.DitoConstant.*; +import static com.engine.dito.ssologin.constant.DitoConstant.*; /** * @version 1.0 diff --git a/src/weaver/interfaces/mq/RocketmqUtil.java b/src/weaver/interfaces/dito/mq/RocketmqUtil.java similarity index 99% rename from src/weaver/interfaces/mq/RocketmqUtil.java rename to src/weaver/interfaces/dito/mq/RocketmqUtil.java index 438cc829..57dedd2c 100644 --- a/src/weaver/interfaces/mq/RocketmqUtil.java +++ b/src/weaver/interfaces/dito/mq/RocketmqUtil.java @@ -1,4 +1,4 @@ -package weaver.interfaces.mq; +package weaver.interfaces.dito.mq; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -11,7 +11,7 @@ import weaver.general.TimeUtil; import weaver.general.Util; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.resource.ResourceComInfo; -import weaver.interfaces.comInfo.PropBean; +import weaver.interfaces.dito.comInfo.PropBean; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/weaver/interfaces/util/HttpUtils.java b/src/weaver/interfaces/dito/util/HttpUtils.java similarity index 99% rename from src/weaver/interfaces/util/HttpUtils.java rename to src/weaver/interfaces/dito/util/HttpUtils.java index fc1bda6d..3a6111c5 100644 --- a/src/weaver/interfaces/util/HttpUtils.java +++ b/src/weaver/interfaces/dito/util/HttpUtils.java @@ -1,4 +1,4 @@ -package weaver.interfaces.util; +package weaver.interfaces.dito.util; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/src/weaver/interfaces/iwhalecloud/util/RSAUtils.java b/src/weaver/interfaces/dito/util/RSAUtils.java similarity index 99% rename from src/weaver/interfaces/iwhalecloud/util/RSAUtils.java rename to src/weaver/interfaces/dito/util/RSAUtils.java index 55109702..62d0065c 100644 --- a/src/weaver/interfaces/iwhalecloud/util/RSAUtils.java +++ b/src/weaver/interfaces/dito/util/RSAUtils.java @@ -1,4 +1,4 @@ -package weaver.interfaces.iwhalecloud.util; +package weaver.interfaces.dito.util; import java.security.KeyFactory; import java.security.PrivateKey; diff --git a/src/weaver/interfaces/util/ReadExcel.java b/src/weaver/interfaces/dito/util/ReadExcel.java similarity index 99% rename from src/weaver/interfaces/util/ReadExcel.java rename to src/weaver/interfaces/dito/util/ReadExcel.java index 22c5de16..08bbe2d7 100644 --- a/src/weaver/interfaces/util/ReadExcel.java +++ b/src/weaver/interfaces/dito/util/ReadExcel.java @@ -1,4 +1,4 @@ -package weaver.interfaces.util; +package weaver.interfaces.dito.util; /** * 类的详细说明