diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java index 9ca7977..a8c01ed 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java @@ -374,7 +374,7 @@ public class UserInfoCmd { log.error("cid:" + cid); - String pageSize = "100"; + String pageSize = "20"; String pageNum = "1"; Map json = new HashMap(); @@ -436,7 +436,7 @@ public class UserInfoCmd { - String pageSize = "100"; + String pageSize = "20"; String pageNum = "1"; Map json = new HashMap(); @@ -445,6 +445,7 @@ public class UserInfoCmd { json.put("pageSize", pageSize); json.put("startDate", sdate); json.put("endDate", edate); + log.error("getPjMtgtcs json:" + JSON.toJSONString(json)); com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request(); diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java index f3d72a0..f20a25f 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/WorkDataCmd.java @@ -87,7 +87,7 @@ public class WorkDataCmd { Map wtMap = getQuestInfo(startday, endday, employeeId); one = (String) wtMap.get("count"); - oneword = "本年问题处理数量"; + oneword = "本年问题处理数"; String pkey = "workdata.technology.wtclsl"; oneurl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -99,11 +99,9 @@ public class WorkDataCmd { twourl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); - - Map gtxzMap = getInteractInfo(startday, endday, employeeId); three = (int) gtxzMap.get("count")+""; - threeword = "本年沟通协作数"; + threeword = "本年协作沟通数"; pkey = "workdata.technology.gtxz"; threeurl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -154,7 +152,7 @@ public class WorkDataCmd { Map wdMap = getDocInfo(startday,endday,employeeId); two = (int) wdMap.get("count")+""; - twoword = "本年文档贡献数"; + twoword = "本年文档贡献度"; pkey = "workdata.other.wdgx"; twourl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -180,7 +178,7 @@ public class WorkDataCmd { Map wdMap = getDocInfo(startday,endday,employeeId); two = (int) wdMap.get("count")+""; - twoword = "本年文档贡献数"; + twoword = "本年文档贡献度"; pkey = "workdata.other.wdgx"; twourl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -255,7 +253,7 @@ public class WorkDataCmd { Map wtMap = getQuestInfo(startday, endday, employeeId); one = (String) wtMap.get("count"); - oneword = "本年问题处理数量"; + oneword = "本年问题处理数"; String pkey = "workdata.technology.wtclsl"; oneurl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -271,7 +269,7 @@ public class WorkDataCmd { Map gtxzMap = getInteractInfo(startday, endday, employeeId); three = (int) gtxzMap.get("count")+""; - threeword = "本年沟通协作数"; + threeword = "本年协作沟通数"; pkey = "workdata.technology.gtxz"; threeurl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -320,7 +318,7 @@ public class WorkDataCmd { Map wdMap = getDocInfo(startday,endday,employeeId); two = (int) wdMap.get("count")+""; - twoword = "本年文档贡献数"; + twoword = "本年文档贡献度"; pkey = "workdata.other.wdgx"; twourl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -332,7 +330,7 @@ public class WorkDataCmd { Map gtxzMap = getInteractInfo(startday,endday,employeeId); four = (int) gtxzMap.get("count")+""; - fourword = "本年沟通协作数"; + fourword = "本年协作沟通数"; pkey = "workdata.other.gtxz"; foururl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -346,7 +344,7 @@ public class WorkDataCmd { Map wdMap = getDocInfo(startday,endday,employeeId); two = (int) wdMap.get("count")+""; - twoword = "本年文档贡献数"; + twoword = "本年文档贡献度"; pkey = "workdata.other.wdgx"; twourl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); @@ -358,7 +356,7 @@ public class WorkDataCmd { Map gtxzMap = getInteractInfo(startday,endday,employeeId); four = (int) gtxzMap.get("count")+""; - fourword = "本年沟通协作数"; + fourword = "本年协作沟通数"; pkey = "workdata.other.gtxz"; foururl = jucailinPortalUtils.getUfPropData(pkey,tenant_key); 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 dc4b7ab..92056b8 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -5,6 +5,7 @@ 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.ebuilder.form.client.entity.obj.Obj; import com.weaver.framework.remote.client.rest.RestClient; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.mc.api.async.AsyncSystemMessageRest; @@ -35,9 +36,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; -import java.time.*; import java.time.format.DateTimeFormatter; -import java.time.temporal.TemporalAdjusters; import java.util.*; @RestController @@ -83,8 +82,6 @@ public class HrmSelfHelpController { public String tenant_key = "t7akvdnf84" ; - - @GetMapping("/testSapi13") @WeaPermission(publicPermission = true) public WeaResult testSapi13(HttpServletRequest request){ @@ -148,7 +145,8 @@ public class HrmSelfHelpController { Map dataMap = new HashMap(); dataMap.put("test","testSapi15"); try { - jucailinPortalUtils.getChatGroup(); + Map dMap = jucailinPortalUtils.getChatGroup(); + dataMap.putAll(dMap); } catch (Exception e) { e.printStackTrace(); log.error("testSapi14:"+e); @@ -158,6 +156,23 @@ public class HrmSelfHelpController { } + @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 { + Map dMap = jucailinPortalUtils.getChatDay(); + 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) // public WeaResult testSapi30(HttpServletRequest request){ 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 ea0f48e..db1f681 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java @@ -78,7 +78,8 @@ public class JucailinPortalUtils { * * */ - public void getChatGroup(){ + public Map getChatGroup(){ + Map dataMap = new HashMap(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); try { SimpleEmployee employee = UserContext.getCurrentUser(); @@ -95,7 +96,7 @@ public class JucailinPortalUtils { Long cid = employee.getCid(); log.error("getChatGroup--cid:"+cid); - String pageSize = "100"; + String pageSize = "10"; String pageNum = "1"; Map json = new HashMap(); @@ -118,11 +119,88 @@ public class JucailinPortalUtils { log.error("response2:"+ response.toString()); if (response.isSuccess()){ String data = response.getData(); - log.error("getChatGroup--data:"+data); + 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); + } + } + } + } + } catch (Exception e) { + e.printStackTrace(); + log.error("testSapi13:"+e); + } + return dataMap; + } + + + public Map getChatDay(){ + Map dataMap = new HashMap(); + 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 = "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); + } + } + } } } catch (Exception e) { e.printStackTrace(); log.error("testSapi13:"+e); } + return dataMap; } + }