diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java index a3b0682..f80f642 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java @@ -637,7 +637,7 @@ public class SelfServiceInfoCmd { String code2 = "" ; try{ - String sql1 =" update uf_zzfwrktaby set qy="+uf_zzfwrktaby_qy+",updater ="+employeeId+",is_flow=0,data_status =1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 "; + String sql1 =" update uf_zzfwrktaby set qy="+uf_zzfwrktaby_qy+",updater ="+employeeId+",is_flow=0,data_status=1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 "; Map result1 = databaseUtils.execute(sourceType, groupId, sql1); Iterator> iterator1 = result1.entrySet().iterator(); while (iterator1.hasNext()){ @@ -648,7 +648,7 @@ public class SelfServiceInfoCmd { code1 = String.valueOf(result1.get("code")); } - String sql2 =" update uf_zzfwrkpz set qy="+uf_zzfwrkpz_qy+",updater ="+employeeId+",is_flow=0,data_status =1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 "; + String sql2 =" update uf_zzfwrkpz set qy="+uf_zzfwrkpz_qy+",updater ="+employeeId+",is_flow=0,data_status=1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 "; Map result2 = databaseUtils.execute(sourceType, groupId, sql2); Iterator> iterator2 = result2.entrySet().iterator(); while (iterator2.hasNext()){ diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java index 9aeb834..5ce7a5f 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -197,44 +197,44 @@ public class HrmSelfHelpController { } - @GetMapping("/testSapi15") - @WeaPermission(publicPermission = true) - public WeaResult testSapi15(HttpServletRequest request){ - //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData - Map dataMap = new HashMap(); - dataMap.put("test","testSapi15"); - try { - String tablename = "uf_nj_cyqltjb" ; - dataMap.put("tablename",tablename); - Map dMap = jucailinPortalUtils.getChatGroup(tenant_key,tablename); - dataMap.putAll(dMap); - } catch (Exception e) { - e.printStackTrace(); - log.error("testSapi14:"+e); - dataMap.put("count","-1"); - } - return WeaResult.success(dataMap); - } - - - @GetMapping("/testSapi16") - @WeaPermission(publicPermission = true) - public WeaResult testSapi16(HttpServletRequest request){ - //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData - Map dataMap = new HashMap(); - dataMap.put("test","testSapi16"); - try { - String tablename = "uf_nj_pjmrdlhhsl" ; - dataMap.put("tablename",tablename); - Map dMap = jucailinPortalUtils.getChatDay(tenant_key,tablename); - dataMap.putAll(dMap); - } catch (Exception e) { - e.printStackTrace(); - log.error("testSapi14:"+e); - dataMap.put("count","-1"); - } - return WeaResult.success(dataMap); - } +// @GetMapping("/testSapi15") +// @WeaPermission(publicPermission = true) +// public WeaResult testSapi15(HttpServletRequest request){ +// //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData +// Map dataMap = new HashMap(); +// dataMap.put("test","testSapi15"); +// try { +// String tablename = "uf_nj_cyqltjb" ; +// dataMap.put("tablename",tablename); +// Map dMap = jucailinPortalUtils.getChatGroup(tenant_key,tablename); +// dataMap.putAll(dMap); +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("testSapi14:"+e); +// dataMap.put("count","-1"); +// } +// return WeaResult.success(dataMap); +// } +// +// +// @GetMapping("/testSapi16") +// @WeaPermission(publicPermission = true) +// public WeaResult testSapi16(HttpServletRequest request){ +// //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData +// Map dataMap = new HashMap(); +// dataMap.put("test","testSapi16"); +// try { +// String tablename = "uf_nj_pjmrdlhhsl" ; +// dataMap.put("tablename",tablename); +// Map dMap = jucailinPortalUtils.getChatDay(tenant_key,tablename); +// dataMap.putAll(dMap); +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("testSapi14:"+e); +// dataMap.put("count","-1"); +// } +// return WeaResult.success(dataMap); +// } // @GetMapping("/testSapi30") // @WeaPermission(publicPermission = true) @@ -1379,10 +1379,10 @@ public class HrmSelfHelpController { List> recordList = databaseUtils.getDataSourceList(result); if(!recordList.isEmpty()){ log.error("!recordList.isEmpty()"); - jucailinPortalUtils.updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename); + chatGroupUtils.updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId); }else{ log.error("recordList.isEmpty()"); - jucailinPortalUtils.insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); + chatGroupUtils.insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); } } } @@ -1437,9 +1437,10 @@ public class HrmSelfHelpController { Map result = databaseUtils.execute(sourceType, groupId, sql); List> recordList = databaseUtils.getDataSourceList(result); if(!recordList.isEmpty()){ - jucailinPortalUtils.updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename); + + chatDayUtils.updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId); }else{ - jucailinPortalUtils.insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); + chatDayUtils.insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); } } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java index 8984ed6..f1b5d3a 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java @@ -26,7 +26,6 @@ import java.text.SimpleDateFormat; import java.util.*; -@Slf4j @RestController @RequestMapping("/api/secondev/njjucailin/portal") public class JucailinPortalController { diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java index dd06726..55c0d37 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java @@ -7,7 +7,6 @@ import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.em.msg.api.entity.Request; import com.weaver.em.msg.api.entity.Response; import com.weaver.framework.rpc.annotation.RpcReference; -import com.weaver.seconddev.cm.rpcutil.HrmCommonRpcUtil; import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.security.context.UserContext; import org.apache.commons.lang3.StringUtils; @@ -31,7 +30,7 @@ public class ChatDayUtils { private DatabaseUtils databaseUtils; @Autowired - private HrmCommonRpcUtil hrmCommonRpcUtil; + private JucailinPortalUtils jucailinPortalUtils; public Map getChatDay(String tenant_key, String tablename,String pageSize,String pageNum){ Map dataMap = new HashMap(); @@ -152,7 +151,7 @@ public class ChatDayUtils { long generate = IdGenerator.generate(); log.error("insertChatDayDate-generate:"+generate+" userid:"+userid+" amount"+amount+" employeeId:"+employeeId); - SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid); + SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); String username = user.getUsername(); String name = user.getName(); log.error("username:"+username); @@ -216,7 +215,7 @@ public class ChatDayUtils { // sqlparam.add(sqlParamEntity); // Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid); + SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); String username = user.getUsername(); String name = user.getName(); log.error("username:"+username); diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java index 20a0ae1..5869855 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java @@ -35,7 +35,7 @@ public class ChatGroupUtils { private DatabaseUtils databaseUtils; @Autowired - private HrmCommonRpcUtil hrmCommonRpcUtil; + private JucailinPortalUtils jucailinPortalUtils; /*** * @@ -164,7 +164,7 @@ public class ChatGroupUtils { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid); + SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); String username = user.getUsername(); String name = user.getName(); log.error("username:"+username); @@ -213,7 +213,7 @@ public class ChatGroupUtils { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(userid); + SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); String username = user.getUsername(); String name = user.getName(); log.error("username:"+username); diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java index e75c3cd..7a1eff2 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java @@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.hrm.entity.employee.HrmEmployee; +import com.weaver.common.hrm.service.HrmCommonEmployeePlusService; +import com.weaver.common.hrm.util.HrmCommonUtil; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.em.msg.api.entity.Request; @@ -35,6 +38,12 @@ public class JucailinPortalUtils { @Autowired private DatabaseUtils databaseUtils; + @Autowired + private HrmCommonEmployeePlusService hrmCommonEmployeePlusService; + + @Autowired + private HrmCommonUtil hrmCommonUtil; + public String getUfPropData(String pkey,String tenant_key) { String pvalue = "" ; String groupId = "weaver-ebuilder-form-service"; @@ -80,504 +89,518 @@ public class JucailinPortalUtils { * * */ - public Map getChatGroup(String tenant_key,String tablename){ - Map dataMap = new HashMap(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - try { - - String startDate = "2001-01-01"; - //设置当前时间 - - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date()); - //同理增加一天的方法： - cal.add(Calendar.DATE, -1); - String endDate = format.format(cal.getTime()); - - log.error("startDate:"+startDate); - log.error("endDate:"+endDate); - - SimpleEmployee employee = UserContext.getCurrentUser(); - Long cid = employee.getCid(); - long employeeId = employee.getEmployeeId(); - log.error("getChatGroup--cid:"+cid); - - String pageSize = "10"; - String pageNum = "1"; - - Map json = new HashMap(); - json.put("cid",cid); - json.put("pageNum",pageNum); - json.put("pageSize",pageSize); - json.put("startDate",startDate); - json.put("endDate",endDate); - - log.error("json:"+ JSON.toJSONString(json)); - - Request request = new Request(); - request.setUrl("/user-profile/groupSession"); - request.setParamsMap(json); - request.setAsync(false); - - log.error("request:"+ request.toString()); - Response response = oaRest.executeIm(request); - log.error("getChatGroup--isSuccess"+response.isSuccess()); - log.error("response2:"+ response.toString()); - if (response.isSuccess()){ - String data = response.getData(); - dataMap.put("data",data); - if(StringUtils.isNotBlank(data)){ - JSONObject dataJson = JSONObject.parseObject(data); - JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); - if(actionMsg.containsKey("code")){ - String code = actionMsg.getString("code"); - if("0".equals(code)){ - JSONObject dataObject = dataJson.getJSONObject("data"); - String count = dataObject.getString("count"); - dataMap.put("count",count); - if(StringUtils.isNotBlank(count)){ - int cou = Integer.parseInt(count); - updateUserChatGroup(cou,cid,startDate,endDate,employeeId,tenant_key,tablename); - } - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - log.error("getChatGroup:"+e); - } - return dataMap; - } - - - /*** - * - * @param count - * @param cid - * @param startDate - * @param endDate - * @param employeeId - */ - public void updateUserChatGroup(int count,long cid,String startDate,String endDate,long employeeId,String tenant_key,String tablename){ - int pagesize = 1000; - int num = (int)Math.ceil(count/1000.0); - log.error("updateUserChatGroup-num:"+num); - for(int i=1;i<=num;i++){ - updateUserChatGroup2Mode(cid,startDate,endDate,i,pagesize,employeeId,tenant_key,tablename); - } - } - - - /*** - * - * @param cid - * @param startDate - * @param endDate - * @param pageNum - * @param pageSize - * @param employeeId - */ - public void updateUserChatGroup2Mode(long cid,String startDate,String endDate,int pageNum,int pageSize,long employeeId,String tenant_key,String tablename){ - try { - String groupId = "weaver-ebuilder-form-service"; - String sourceType = "LOGIC"; - - Map json = new HashMap(); - json.put("cid",cid); - json.put("pageNum",pageNum); - json.put("pageSize",pageSize); - json.put("startDate",startDate); - json.put("endDate",endDate); - - log.error("json:"+ JSON.toJSONString(json)); - - Request request = new Request(); - request.setUrl("/user-profile/groupSession"); - request.setParamsMap(json); - request.setAsync(false); - - log.error("request:"+ request.toString()); - Response response = oaRest.executeIm(request); - log.error("getChatGroup--isSuccess"+response.isSuccess()); - log.error("response2:"+ response.toString()); - if (response.isSuccess()){ - String data = response.getData(); - if(StringUtils.isNotBlank(data)){ - JSONObject dataJson = JSONObject.parseObject(data); - JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); - if(actionMsg.containsKey("code")){ - String code = actionMsg.getString("code"); - if("0".equals(code)){ - JSONObject dataObject = dataJson.getJSONObject("data"); - if(dataObject.containsKey("data")){ - JSONArray dataArray = dataObject.getJSONArray("data"); - for(int i=0;i sqlparam = new ArrayList(); - SqlParamEntity sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(userid+""); - sqlparam.add(sqlParamEntity); - - sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(tenant_key+""); - sqlparam.add(sqlParamEntity); - - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - List> recordList = databaseUtils.getDataSourceList(result); - if(!recordList.isEmpty()){ - updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename); - }else{ - insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); - } - } - } - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - log.error("updateUserChatGroup2Mode:"+e); - } - } - - /*** - * - * @param userid - * @param amount - * @param employeeId - * @param sourceType - * @param groupId - * @param tenant_key - */ - public void insertChatGroupDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ - - try { - long generate = IdGenerator.generate(); - String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type) " + - " values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0)"; - log.error("insertChatGroupDate-sql:"+sql); - Map result = databaseUtils.execute(sourceType, groupId, sql); - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("insertChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i map = recordList.get(i); - for (String key:map.keySet()){ - System.out.println("insertChatGroupDate--key= "+key+" and value= "+String.valueOf(map.get(key))); - } - } - }catch (Exception e){ - e.printStackTrace(); - log.error("insertChatGroupDate:"+e); - } - } - - /*** - * - * @param userid - * @param amount - * @param sourceType - * @param groupId - * @param tenant_key - */ - public void updateChatGroupDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename){ - try { - String sql =" update "+tablename+" set amount=?,update_time=now() where ry = ? and tenant_key= ? and delete_type=0 "; - List sqlparam = new ArrayList(); - SqlParamEntity sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(amount+""); - sqlparam.add(sqlParamEntity); - - sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(userid+""); - sqlparam.add(sqlParamEntity); - - sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(tenant_key); - sqlparam.add(sqlParamEntity); - - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("insertChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i map = recordList.get(i); - for (String key:map.keySet()){ - System.out.println("insertChatDayDate222--key= "+key+" and value= "+String.valueOf(map.get(key))); - } - } - }catch (Exception e){ - e.printStackTrace(); - log.error("updateChatGroupDate:"+e); - } - } - - - public Map getChatDay(String tenant_key,String tablename){ - Map dataMap = new HashMap(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - try { - SimpleEmployee employee = UserContext.getCurrentUser(); - - String startDate = "2001-01-01"; - - Calendar cal = Calendar.getInstance(); - //设置当前时间 - cal.setTime(new Date()); - //同理增加一天的方法： - cal.add(Calendar.DATE, -1); - String endDate = format.format(cal.getTime()); - - log.error("startDate:"+startDate); - log.error("endDate:"+endDate); - Long cid = employee.getCid(); - log.error("getChatGroup--cid:"+cid); - Long employeeId = employee.getEmployeeId(); - - String pageSize = "10"; - String pageNum = "1"; - - Map json = new HashMap(); - json.put("cid",cid); - json.put("pageNum",pageNum); - json.put("pageSize",pageSize); - json.put("startDate",startDate); - json.put("endDate",endDate); - - log.error("json:"+ JSON.toJSONString(json)); - - Request request = new Request(); - request.setUrl("/user-profile/dailySingleSession"); - request.setParamsMap(json); - request.setAsync(false); - - log.error("request:"+ request.toString()); - Response response = oaRest.executeIm(request); - log.error("getChatGroup--isSuccess"+response.isSuccess()); - log.error("response2:"+ response.toString()); - if (response.isSuccess()){ - String data = response.getData(); - dataMap.put("data",data); - if(StringUtils.isNotBlank(data)){ - JSONObject dataJson = JSONObject.parseObject(data); - JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); - if(actionMsg.containsKey("code")){ - String code = actionMsg.getString("code"); - if("0".equals(code)){ - JSONObject dataObject = dataJson.getJSONObject("data"); - String count = dataObject.getString("count"); - dataMap.put("count",count); - - if(StringUtils.isNotBlank(count)){ - int cou = Integer.parseInt(count); - updateUserChatDay(cou,cid,startDate,endDate,employeeId,tenant_key,tablename); - } - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - log.error("testSapi13:"+e); - } - return dataMap; - } - - - public void updateUserChatDay(int count,long cid,String startDate,String endDate,long employeeId,String tenant_key,String tablename){ - int pagesize = 1000; - int num = (int)Math.ceil(count/1000.0); - log.error("updateUserChatGroup-num:"+num); - for(int i=1;i<=num;i++){ - updateUserChatDay2Mode(cid,startDate,endDate,i,pagesize,employeeId,tenant_key,tablename); - } - } - - - /*** - * - * @param cid - * @param startDate - * @param endDate - * @param pageNum - * @param pageSize - * @param employeeId - */ - public void updateUserChatDay2Mode(long cid,String startDate,String endDate,int pageNum,int pageSize,long employeeId,String tenant_key,String tablename){ - try { - String groupId = "weaver-ebuilder-form-service"; - String sourceType = "LOGIC"; - - Map json = new HashMap(); - json.put("cid",cid); - json.put("pageNum",pageNum); - json.put("pageSize",pageSize); - json.put("startDate",startDate); - json.put("endDate",endDate); - - log.error("json:"+ JSON.toJSONString(json)); - - Request request = new Request(); - request.setUrl("/user-profile/groupSession"); - request.setParamsMap(json); - request.setAsync(false); - - log.error("request:"+ request.toString()); - Response response = oaRest.executeIm(request); - log.error("getChatGroup--isSuccess"+response.isSuccess()); - log.error("response2:"+ response.toString()); - if (response.isSuccess()){ - String data = response.getData(); - if(StringUtils.isNotBlank(data)){ - JSONObject dataJson = JSONObject.parseObject(data); - JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); - if(actionMsg.containsKey("code")){ - String code = actionMsg.getString("code"); - if("0".equals(code)){ - JSONObject dataObject = dataJson.getJSONObject("data"); - if(dataObject.containsKey("data")){ - JSONArray dataArray = dataObject.getJSONArray("data"); - for(int i=0;i sqlparam = new ArrayList(); - SqlParamEntity sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(userid+""); - sqlparam.add(sqlParamEntity); - - sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(tenant_key+""); - sqlparam.add(sqlParamEntity); - - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - List> recordList = databaseUtils.getDataSourceList(result); - if(!recordList.isEmpty()){ - updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename); - }else{ - insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); - } - } - } - } - } - } - } - } catch (Exception e) { - e.printStackTrace(); - log.error("updateUserChatGroup2Mode:"+e); - } +// public Map getChatGroup(String tenant_key,String tablename){ +// Map dataMap = new HashMap(); +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); +// try { +// +// String startDate = "2001-01-01"; +// //设置当前时间 +// +// Calendar cal = Calendar.getInstance(); +// cal.setTime(new Date()); +// //同理增加一天的方法： +// cal.add(Calendar.DATE, -1); +// String endDate = format.format(cal.getTime()); +// +// log.error("startDate:"+startDate); +// log.error("endDate:"+endDate); +// +// SimpleEmployee employee = UserContext.getCurrentUser(); +// Long cid = employee.getCid(); +// long employeeId = employee.getEmployeeId(); +// log.error("getChatGroup--cid:"+cid); +// +// String pageSize = "10"; +// String pageNum = "1"; +// +// Map json = new HashMap(); +// json.put("cid",cid); +// json.put("pageNum",pageNum); +// json.put("pageSize",pageSize); +// json.put("startDate",startDate); +// json.put("endDate",endDate); +// +// log.error("json:"+ JSON.toJSONString(json)); +// +// Request request = new Request(); +// request.setUrl("/user-profile/groupSession"); +// request.setParamsMap(json); +// request.setAsync(false); +// +// log.error("request:"+ request.toString()); +// Response response = oaRest.executeIm(request); +// log.error("getChatGroup--isSuccess"+response.isSuccess()); +// log.error("response2:"+ response.toString()); +// if (response.isSuccess()){ +// String data = response.getData(); +// dataMap.put("data",data); +// if(StringUtils.isNotBlank(data)){ +// JSONObject dataJson = JSONObject.parseObject(data); +// JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); +// if(actionMsg.containsKey("code")){ +// String code = actionMsg.getString("code"); +// if("0".equals(code)){ +// JSONObject dataObject = dataJson.getJSONObject("data"); +// String count = dataObject.getString("count"); +// dataMap.put("count",count); +// if(StringUtils.isNotBlank(count)){ +// int cou = Integer.parseInt(count); +// updateUserChatGroup(cou,cid,startDate,endDate,employeeId,tenant_key,tablename); +// } +// } +// } +// } +// } +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("getChatGroup:"+e); +// } +// return dataMap; +// } +// +// +// /*** +// * +// * @param count +// * @param cid +// * @param startDate +// * @param endDate +// * @param employeeId +// */ +// public void updateUserChatGroup(int count,long cid,String startDate,String endDate,long employeeId,String tenant_key,String tablename){ +// int pagesize = 1000; +// int num = (int)Math.ceil(count/1000.0); +// log.error("updateUserChatGroup-num:"+num); +// for(int i=1;i<=num;i++){ +// updateUserChatGroup2Mode(cid,startDate,endDate,i,pagesize,employeeId,tenant_key,tablename); +// } +// } +// +// +// /*** +// * +// * @param cid +// * @param startDate +// * @param endDate +// * @param pageNum +// * @param pageSize +// * @param employeeId +// */ +// public void updateUserChatGroup2Mode(long cid,String startDate,String endDate,int pageNum,int pageSize,long employeeId,String tenant_key,String tablename){ +// try { +// String groupId = "weaver-ebuilder-form-service"; +// String sourceType = "LOGIC"; +// +// Map json = new HashMap(); +// json.put("cid",cid); +// json.put("pageNum",pageNum); +// json.put("pageSize",pageSize); +// json.put("startDate",startDate); +// json.put("endDate",endDate); +// +// log.error("json:"+ JSON.toJSONString(json)); +// +// Request request = new Request(); +// request.setUrl("/user-profile/groupSession"); +// request.setParamsMap(json); +// request.setAsync(false); +// +// log.error("request:"+ request.toString()); +// Response response = oaRest.executeIm(request); +// log.error("getChatGroup--isSuccess"+response.isSuccess()); +// log.error("response2:"+ response.toString()); +// if (response.isSuccess()){ +// String data = response.getData(); +// if(StringUtils.isNotBlank(data)){ +// JSONObject dataJson = JSONObject.parseObject(data); +// JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); +// if(actionMsg.containsKey("code")){ +// String code = actionMsg.getString("code"); +// if("0".equals(code)){ +// JSONObject dataObject = dataJson.getJSONObject("data"); +// if(dataObject.containsKey("data")){ +// JSONArray dataArray = dataObject.getJSONArray("data"); +// for(int i=0;i sqlparam = new ArrayList(); +// SqlParamEntity sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(userid+""); +// sqlparam.add(sqlParamEntity); +// +// sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(tenant_key+""); +// sqlparam.add(sqlParamEntity); +// +// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); +// List> recordList = databaseUtils.getDataSourceList(result); +// if(!recordList.isEmpty()){ +// updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename); +// }else{ +// insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); +// } +// } +// } +// } +// } +// } +// } +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("updateUserChatGroup2Mode:"+e); +// } +// } +// +// /*** +// * +// * @param userid +// * @param amount +// * @param employeeId +// * @param sourceType +// * @param groupId +// * @param tenant_key +// */ +// public void insertChatGroupDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ +// +// try { +// long generate = IdGenerator.generate(); +// String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type) " + +// " values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0)"; +// log.error("insertChatGroupDate-sql:"+sql); +// Map result = databaseUtils.execute(sourceType, groupId, sql); +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("insertChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// List> recordList = databaseUtils.getDataSourceList(result); +// for(int i=0;i map = recordList.get(i); +// for (String key:map.keySet()){ +// System.out.println("insertChatGroupDate--key= "+key+" and value= "+String.valueOf(map.get(key))); +// } +// } +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("insertChatGroupDate:"+e); +// } +// } +// +// /*** +// * +// * @param userid +// * @param amount +// * @param sourceType +// * @param groupId +// * @param tenant_key +// */ +// public void updateChatGroupDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename){ +// try { +// String sql =" update "+tablename+" set amount=?,update_time=now() where ry = ? and tenant_key= ? and delete_type=0 "; +// List sqlparam = new ArrayList(); +// SqlParamEntity sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(amount+""); +// sqlparam.add(sqlParamEntity); +// +// sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(userid+""); +// sqlparam.add(sqlParamEntity); +// +// sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(tenant_key); +// sqlparam.add(sqlParamEntity); +// +// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("insertChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// List> recordList = databaseUtils.getDataSourceList(result); +// for(int i=0;i map = recordList.get(i); +// for (String key:map.keySet()){ +// System.out.println("insertChatDayDate222--key= "+key+" and value= "+String.valueOf(map.get(key))); +// } +// } +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("updateChatGroupDate:"+e); +// } +// } +// +// +// public Map getChatDay(String tenant_key,String tablename){ +// Map dataMap = new HashMap(); +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); +// try { +// SimpleEmployee employee = UserContext.getCurrentUser(); +// +// String startDate = "2001-01-01"; +// +// Calendar cal = Calendar.getInstance(); +// //设置当前时间 +// cal.setTime(new Date()); +// //同理增加一天的方法： +// cal.add(Calendar.DATE, -1); +// String endDate = format.format(cal.getTime()); +// +// log.error("startDate:"+startDate); +// log.error("endDate:"+endDate); +// Long cid = employee.getCid(); +// log.error("getChatGroup--cid:"+cid); +// Long employeeId = employee.getEmployeeId(); +// +// String pageSize = "10"; +// String pageNum = "1"; +// +// Map json = new HashMap(); +// json.put("cid",cid); +// json.put("pageNum",pageNum); +// json.put("pageSize",pageSize); +// json.put("startDate",startDate); +// json.put("endDate",endDate); +// +// log.error("json:"+ JSON.toJSONString(json)); +// +// Request request = new Request(); +// request.setUrl("/user-profile/dailySingleSession"); +// request.setParamsMap(json); +// request.setAsync(false); +// +// log.error("request:"+ request.toString()); +// Response response = oaRest.executeIm(request); +// log.error("getChatGroup--isSuccess"+response.isSuccess()); +// log.error("response2:"+ response.toString()); +// if (response.isSuccess()){ +// String data = response.getData(); +// dataMap.put("data",data); +// if(StringUtils.isNotBlank(data)){ +// JSONObject dataJson = JSONObject.parseObject(data); +// JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); +// if(actionMsg.containsKey("code")){ +// String code = actionMsg.getString("code"); +// if("0".equals(code)){ +// JSONObject dataObject = dataJson.getJSONObject("data"); +// String count = dataObject.getString("count"); +// dataMap.put("count",count); +// +// if(StringUtils.isNotBlank(count)){ +// int cou = Integer.parseInt(count); +// updateUserChatDay(cou,cid,startDate,endDate,employeeId,tenant_key,tablename); +// } +// } +// } +// } +// } +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("testSapi13:"+e); +// } +// return dataMap; +// } +// +// +// public void updateUserChatDay(int count,long cid,String startDate,String endDate,long employeeId,String tenant_key,String tablename){ +// int pagesize = 1000; +// int num = (int)Math.ceil(count/1000.0); +// log.error("updateUserChatGroup-num:"+num); +// for(int i=1;i<=num;i++){ +// updateUserChatDay2Mode(cid,startDate,endDate,i,pagesize,employeeId,tenant_key,tablename); +// } +// } +// +// +// /*** +// * +// * @param cid +// * @param startDate +// * @param endDate +// * @param pageNum +// * @param pageSize +// * @param employeeId +// */ +// public void updateUserChatDay2Mode(long cid,String startDate,String endDate,int pageNum,int pageSize,long employeeId,String tenant_key,String tablename){ +// try { +// String groupId = "weaver-ebuilder-form-service"; +// String sourceType = "LOGIC"; +// +// Map json = new HashMap(); +// json.put("cid",cid); +// json.put("pageNum",pageNum); +// json.put("pageSize",pageSize); +// json.put("startDate",startDate); +// json.put("endDate",endDate); +// +// log.error("json:"+ JSON.toJSONString(json)); +// +// Request request = new Request(); +// request.setUrl("/user-profile/groupSession"); +// request.setParamsMap(json); +// request.setAsync(false); +// +// log.error("request:"+ request.toString()); +// Response response = oaRest.executeIm(request); +// log.error("getChatGroup--isSuccess"+response.isSuccess()); +// log.error("response2:"+ response.toString()); +// if (response.isSuccess()){ +// String data = response.getData(); +// if(StringUtils.isNotBlank(data)){ +// JSONObject dataJson = JSONObject.parseObject(data); +// JSONObject actionMsg = dataJson.getJSONObject("actionMsg"); +// if(actionMsg.containsKey("code")){ +// String code = actionMsg.getString("code"); +// if("0".equals(code)){ +// JSONObject dataObject = dataJson.getJSONObject("data"); +// if(dataObject.containsKey("data")){ +// JSONArray dataArray = dataObject.getJSONArray("data"); +// for(int i=0;i sqlparam = new ArrayList(); +// SqlParamEntity sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(userid+""); +// sqlparam.add(sqlParamEntity); +// +// sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(tenant_key+""); +// sqlparam.add(sqlParamEntity); +// +// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); +// List> recordList = databaseUtils.getDataSourceList(result); +// if(!recordList.isEmpty()){ +// updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename); +// }else{ +// insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); +// } +// } +// } +// } +// } +// } +// } +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("updateUserChatGroup2Mode:"+e); +// } +// } +// +// +// /*** +// * +// * @param userid +// * @param amount +// * @param employeeId +// * @param sourceType +// * @param groupId +// * @param tenant_key +// */ +// public void insertChatDayDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ +// +// try { +// long generate = IdGenerator.generate(); +// String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type) " + +// " values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0)"; +// log.error("insertChatDayDate-sql:"+sql); +// Map result = databaseUtils.execute(sourceType, groupId, sql); +// +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("insertChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// List> recordList = databaseUtils.getDataSourceList(result); +// for(int i=0;i map = recordList.get(i); +// for (String key:map.keySet()){ +// System.out.println("insertChatDayDate222--key= "+key+" and value= "+String.valueOf(map.get(key))); +// } +// } +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("insertChatGroupDate:"+e); +// } +// } +// +// /*** +// * +// * @param userid +// * @param amount +// * @param sourceType +// * @param groupId +// * @param tenant_key +// */ +// public void updateChatDayDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename){ +// try { +// String sql =" update "+tablename+" set amount=?,update_time=now() where ry = ? and tenant_key= ? and delete_type=0 "; +// log.error("updateChatDayDate-sql:"+sql); +// +// List sqlparam = new ArrayList(); +// SqlParamEntity sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(amount+""); +// sqlparam.add(sqlParamEntity); +// +// sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(userid+""); +// sqlparam.add(sqlParamEntity); +// +// sqlParamEntity = new SqlParamEntity(); +// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +// sqlParamEntity.setValue(tenant_key); +// sqlparam.add(sqlParamEntity); +// +// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("insertChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// List> recordList = databaseUtils.getDataSourceList(result); +// for(int i=0;i map = recordList.get(i); +// for (String key:map.keySet()){ +// System.out.println("insertChatDayDate222--key= "+key+" and value= "+String.valueOf(map.get(key))); +// } +// } +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("updateChatGroupDate:"+e); +// } +// } + + + + + public HrmEmployee getHrmEmployee(Long employId) { + HrmEmployee hrmEmployee = (HrmEmployee)hrmCommonEmployeePlusService.getById(employId); + return hrmEmployee; } - - /*** - * - * @param userid - * @param amount - * @param employeeId - * @param sourceType - * @param groupId - * @param tenant_key - */ - public void insertChatDayDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ - - try { - long generate = IdGenerator.generate(); - String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type) " + - " values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0)"; - log.error("insertChatDayDate-sql:"+sql); - Map result = databaseUtils.execute(sourceType, groupId, sql); - - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("insertChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i map = recordList.get(i); - for (String key:map.keySet()){ - System.out.println("insertChatDayDate222--key= "+key+" and value= "+String.valueOf(map.get(key))); - } - } - }catch (Exception e){ - e.printStackTrace(); - log.error("insertChatGroupDate:"+e); - } + public SimpleEmployee getSimpleEmployee(Long employId) { + SimpleEmployee simpleEmployee = hrmCommonUtil.getSimpleEmployee(employId); + return simpleEmployee; } - /*** - * - * @param userid - * @param amount - * @param sourceType - * @param groupId - * @param tenant_key - */ - public void updateChatDayDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename){ - try { - String sql =" update "+tablename+" set amount=?,update_time=now() where ry = ? and tenant_key= ? and delete_type=0 "; - log.error("updateChatDayDate-sql:"+sql); - - List sqlparam = new ArrayList(); - SqlParamEntity sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(amount+""); - sqlparam.add(sqlParamEntity); - - sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(userid+""); - sqlparam.add(sqlParamEntity); - - sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(tenant_key); - sqlparam.add(sqlParamEntity); - - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("insertChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - List> recordList = databaseUtils.getDataSourceList(result); - for(int i=0;i map = recordList.get(i); - for (String key:map.keySet()){ - System.out.println("insertChatDayDate222--key= "+key+" and value= "+String.valueOf(map.get(key))); - } - } - }catch (Exception e){ - e.printStackTrace(); - log.error("updateChatGroupDate:"+e); - } - } }