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 d3f8299..9a35bec 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -4,11 +4,9 @@ import com.weaver.common.authority.annotation.WeaPermission; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; -import com.weaver.em.msg.api.rest.OaRest; import com.weaver.framework.remote.client.rest.RestClient; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.mc.api.async.AsyncSystemMessageRest; -import com.weaver.mc.api.entity.*; import com.weaver.mc.api.rest.SystemMessageRest; import com.weaver.seconddev.jcldoor.util.DatabaseUtils; import com.weaver.seconddev.jcldoor.util.JucailinPortalUtils; @@ -64,7 +62,7 @@ public class HrmSelfHelpController { DocClientService docClientService; @RpcReference - private OaRest oaRest; + private com.weaver.em.msg.api.rest.OaRest oaRest; @RpcReference private RemoteBlogInfoService remoteBlogInfoService ; @@ -83,37 +81,7 @@ public class HrmSelfHelpController { public String tenant_key = "t7akvdnf84" ; - @GetMapping("/testSapi10") - @WeaPermission(publicPermission = true) - public WeaResult testSapi10(HttpServletRequest request){ - Map dataMap = new HashMap(); - dataMap.put("test","testSapi10"); - try { - SimpleEmployee employee = UserContext.getCurrentUser(); - log.error("employee:"+employee.getEmployeeId()); - - employee.getFormdata(); - - RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity(); - log.error("3333333"); - WeaResult requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity); - log.error("requestCountInfo:"+requestCountInfo.toString()); - int code = requestCountInfo.getCode(); - log.error("code:"+code); - RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData(); - log.error("requestCountInfoPAEntity:"+requestCountInfoPAEntity); - long count = requestCountInfoPAEntity.getCount(); - log.error("count:"+count); - dataMap.put("code",code); - dataMap.put("count",count); - } catch (Exception e) { - e.printStackTrace(); - log.error("testSapi10:"+e); - dataMap.put("count","-1"); - } - return WeaResult.success(dataMap); - } @GetMapping("/testSapi13") @@ -129,7 +97,7 @@ public class HrmSelfHelpController { Calendar cal = Calendar.getInstance(); int year = cal.get(Calendar.YEAR); - String startDate = year+"-01-01"; + String startDate = "2018-01-01"; //设置当前时间 cal.setTime(new Date()); @@ -172,47 +140,32 @@ public class HrmSelfHelpController { } - @GetMapping("/testSapi14") + @GetMapping("/testSapi16") @WeaPermission(publicPermission = true) - public WeaResult testSapi14(HttpServletRequest request){ - //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData + public WeaResult testSapi16(HttpServletRequest request){ Map dataMap = new HashMap(); - dataMap.put("test","testSapi14"); + dataMap.put("test","testSapi16"); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { - SimpleEmployee employee = UserContext.getCurrentUser(); - Calendar cal = Calendar.getInstance(); - int year = cal.get(Calendar.YEAR); - String startDate = year+"-01-01"; - - //设置当前时间 - cal.setTime(new Date()); - //同理增加一天的方法: - cal.add(Calendar.DATE, 1); - String endDate = format.format(cal.getTime()); - - Long cid = employee.getCid(); - String pageSize = "100"; - 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); - - com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request(); - emrequest.setUrl("/user-profile/dailySingleSession"); - emrequest.setParamsMap(json); - com.weaver.em.msg.api.entity.Response response = oaRest.executeIm(emrequest); + } catch (Exception e) { + e.printStackTrace(); + log.error("testSapi13:"+e); + dataMap.put("count","-1"); + } + return WeaResult.success(dataMap); + } - String data = response.getData(); - dataMap.put("datas",data); + @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 { + jucailinPortalUtils.getChatGroup(); } catch (Exception e) { e.printStackTrace(); log.error("testSapi14:"+e); 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 be65237..c58deb0 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java @@ -3,7 +3,12 @@ package com.weaver.seconddev.jcldoor.util; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; +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.jcldoor.controller.JucailinPortalController; +import com.weaver.teams.domain.user.SimpleEmployee; +import com.weaver.teams.security.context.UserContext; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -11,6 +16,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.text.SimpleDateFormat; import java.util.*; @@ -20,6 +26,10 @@ public class JucailinPortalUtils { private final Logger log = LoggerFactory.getLogger(JucailinPortalUtils.class); + + @RpcReference + private com.weaver.em.msg.api.rest.OaRest oaRest; + @Autowired private DatabaseUtils databaseUtils; @@ -62,4 +72,51 @@ public class JucailinPortalUtils { } return pvalue; } + + + /*** + * + * + */ + public void getChatGroup(){ + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + try { + SimpleEmployee employee = UserContext.getCurrentUser(); + Calendar cal = Calendar.getInstance(); + int year = cal.get(Calendar.YEAR); + String startDate = "2020-01-01"; + //设置当前时间 + 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); + + String pageSize = "20"; + 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); + + Request emrequest = new Request(); + emrequest.setUrl("/user-profile/groupSession"); + emrequest.setParamsMap(json); + Response response = oaRest.executeIm(emrequest); + log.error("getChatGroup--isSuccess"+response.isSuccess()); + if (response.isSuccess()){ + String data = response.getData(); + log.error("getChatGroup--data:"+data); + } + } catch (Exception e) { + e.printStackTrace(); + log.error("testSapi13:"+e); + } + } }