diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java index 7a9f65a..48bdf59 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java @@ -64,7 +64,8 @@ public class CockpitMonthPerformanceInfoCmd { scoreMap.put(currentMonth,score); } - dataMap.put("score",dataMap); + dataMap.put("datas",scoreMap); + } catch (Exception e) { e.printStackTrace(); log.error("PortalPerformanceInfoCmd :" + e); diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java index cc2b10f..bac11c9 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java @@ -4,8 +4,8 @@ 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.framework.rpc.annotation.RpcReference; -import com.weaver.seconddev.jcldoor.util.DatabaseUtils; -import com.weaver.seconddev.jcldoor.util.JucailinPortalUtils; +import com.weaver.seconddev.cockpit.util.DatabaseUtils; +import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils; import com.weaver.teams.domain.hr.entity.FlowData; import com.weaver.teams.domain.hr.entity.FlowDataListReq; import com.weaver.teams.domain.hr.entity.FlowDataListRes; @@ -45,7 +45,7 @@ public class CockpitWorkAchievementsCmd { public RemotePerformanceService remotePerformanceService; @Autowired - private JucailinPortalUtils jucailinPortalUtils; + private JucailinCockpitUtils jucailinCockpitUtils; @Autowired private DatabaseUtils databaseUtils; @@ -58,11 +58,11 @@ public class CockpitWorkAchievementsCmd { Map recordMap = new HashMap(); - List> list = new ArrayList<>(100); - Map oneMap = new HashMap<>(100); - Map twoMap = new HashMap<>(100); - Map threeMap = new HashMap<>(100); - Map fourMap = new HashMap<>(100); + List> list = new ArrayList>(100); + Map oneMap = new HashMap(100); + Map twoMap = new HashMap(100); + Map threeMap = new HashMap(100); + Map fourMap = new HashMap(100); String startday = String.valueOf(paramMap.get("startday")); @@ -96,118 +96,130 @@ public class CockpitWorkAchievementsCmd { one = getQuestInfo(startday, endday, employeeId,tenantKey); oneword = "本年问题处理数"; String pkey = "workdata.technology.wtclsl"; - oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); two = getDaysInfo(startday, endday, employeeId,tenantKey); twoword = "本年开发人天"; pkey = "workdata.technology.kfrt"; - twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); three = getCoWorkInfo(startday,endday, employeeId,tenantKey); threeword = "本年协作沟通数"; pkey = "workdata.technology.gtxz"; - threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); four = getWfInfo(simpleEmployee); fourword = "本年处理流程数"; pkey = "workdata.technology.cllc"; - foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); }else if("1".equals(znlx)){ one = "0.00"; oneword = "本年验收指标"; String pkey = "workdata.project.yszb"; - oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); //项目验收信息 two = getYsInfo(employeeId,startday,endday); two = parseJe(two); + log.error("four:"+four); twoword = "本年验收金额"; pkey = "workdata.project.ysje"; - twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); three = "0.00"; threeword = "本年指标达成率"; pkey = "workdata.project.zbdcl"; - threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); //项目收款信息 four = getSkInfo(employeeId,startday,endday,tenantKey); + log.error("four:"+four); four = parseJe(four); + log.error("four2:"+four); fourword = "本年收款金额"; pkey = "workdata.project.skje"; - foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); }else if("3".equals(znlx)){ one = getWfInfo(simpleEmployee); oneword = "本年处理流程数"; String pkey = "workdata.other.cllc"; - oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); two = getDocInfo(startday,endday,employeeId,tenantKey); twoword = "本年文档贡献度"; pkey = "workdata.other.wdgx"; - twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); three = getDailyInfo(startday,endday,employeeId,tenantKey); threeword = "本年微博填写数"; pkey = "workdata.other.wbtx"; - threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); four = getCoWorkInfo(startday,endday,employeeId,tenantKey); fourword = "本年沟通协作数"; pkey = "workdata.other.gtxz"; - foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); }else{ one = getWfInfo(simpleEmployee); oneword = "本年处理流程数"; String pkey = "workdata.other.cllc"; - oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); two = getDocInfo(startday,endday,employeeId,tenantKey); twoword = "本年文档贡献度"; pkey = "workdata.other.wdgx"; - twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); three = getDailyInfo(startday,endday,employeeId,tenantKey); threeword = "本年微博填写数"; pkey = "workdata.other.wbtx"; - threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); + threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); four = getCoWorkInfo(startday,endday,employeeId,tenantKey); fourword = "本年沟通协作数"; pkey = "workdata.other.gtxz"; - foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); - + foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey); } - oneMap.put("name",oneword); oneMap.put("value",one); oneMap.put("url",oneurl); + + log.error("1111"); + twoMap.put("name",twoword); twoMap.put("value",two); twoMap.put("url",twourl); + + log.error("2222"); + threeMap.put("name",threeword); threeMap.put("value",three); threeMap.put("url",threeurl); + + log.error("3333"); + fourMap.put("name",fourword); fourMap.put("value",four); fourMap.put("url",foururl); + log.error("4444"); + list.add(oneMap); list.add(twoMap); list.add(threeMap); list.add(fourMap); - recordMap.put("list",list); + recordMap.put("datas",list); } catch (Exception e) { e.printStackTrace(); - log.error("PortalPerformanceInfoCmd :" + e); + log.error("CockpitWorkAchievementsCmd :" + e); } return recordMap; } @@ -324,7 +336,7 @@ public class CockpitWorkAchievementsCmd { try{ long formdata = employee.getFormdata(); String pkey = "field69.groupId"; - String groupId = jucailinPortalUtils.getUfPropData(pkey,tenantkey); + String groupId = jucailinCockpitUtils.getUfPropData(pkey,tenantkey); log.error("groupId:"+groupId); String field69 = ""; @@ -527,7 +539,7 @@ public class CockpitWorkAchievementsCmd { String groupId = "weaver-ebuilder-form-service"; String sourceType = "LOGIC"; - String htzje = "0.00"; + String skje = "0.00"; try { Calendar calendar = Calendar.getInstance(); @@ -601,16 +613,18 @@ public class CockpitWorkAchievementsCmd { strlist.add(employeeId); List sqlparam = databaseUtils.getSqlParamEntity(strlist); Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - List> recordList = databaseUtils.getDataSourceList(result); + log.error("recordList:"+recordList.size()); + if(!CollectionUtils.isEmpty(recordList)){ - htzje = String.valueOf(recordList.get(0).get("htzje")); + skje = String.valueOf(recordList.get(0).get("skje")); } + log.error("skje:"+skje); } catch (Exception e) { e.printStackTrace(); log.error("PorojectReceiptsInfoCmd Exception:"+e); } - return htzje; + return skje; } diff --git a/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java b/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java index b2f9e42..9ade9d3 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java +++ b/src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java @@ -84,7 +84,7 @@ public class JucailinCockpitController { @GetMapping("/getUserData4Type") @WeaPermission(publicPermission = true) public WeaResult getUserData4Type(HttpServletRequest request){ - log.error("getWorkData"); + log.error("getUserData4Type"); Map dataList = new HashMap(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); Map params = jucailinCockpitUtils.request2Map(request); @@ -102,7 +102,7 @@ public class JucailinCockpitController { @GetMapping("/getWorkflowAnalysis") @WeaPermission(publicPermission = true) public WeaResult getWorkflowAnalysis(HttpServletRequest request){ - log.error("getWorkData"); + log.error("getWorkflowAnalysis"); Map dataList = new HashMap(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); Map params = jucailinCockpitUtils.request2Map(request); @@ -116,6 +116,24 @@ public class JucailinCockpitController { } + @GetMapping("/getDocmentAnalysis") + @WeaPermission(publicPermission = true) + public WeaResult getDocmentAnalysis(HttpServletRequest request){ + log.error("getDocmentAnalysis"); + Map dataList = new HashMap(); + SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); + Map params = jucailinCockpitUtils.request2Map(request); + + try{ + dataList = jucailinCockpitService.getDocmentAnalysis(simpleEmployee,params,tenant_key); + }catch (Exception e){ + log.error("getWorkData-Exception:"+e.getMessage()); + } + return WeaResult.success(dataList); + } + + + @GetMapping("/getBlogData") @WeaPermission(publicPermission = true) diff --git a/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java b/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java index 3e3f752..8c3044d 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java +++ b/src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java @@ -14,6 +14,8 @@ public interface JucailinCockpitService { Map getWorkflowAnalysis(SimpleEmployee simpleEmployee,Map paramMap,String tenantKey); + Map getDocmentAnalysis(SimpleEmployee simpleEmployee,Map paramMap,String tenantKey); + Map getBlogData(SimpleEmployee simpleEmployee,Map paramMap,String tenantKey); } diff --git a/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java b/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java index 48837c9..f0b0453 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java +++ b/src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java @@ -1,8 +1,6 @@ package com.weaver.seconddev.cockpit.service.impl; -import com.weaver.seconddev.cockpit.cmd.CockpitMonthPerformanceInfoCmd; -import com.weaver.seconddev.cockpit.cmd.CockpitWorkAchievementsCmd; -import com.weaver.seconddev.cockpit.cmd.CockpitWorkDate4TypeCmd; +import com.weaver.seconddev.cockpit.cmd.*; import com.weaver.seconddev.cockpit.service.JucailinCockpitService; import com.weaver.teams.domain.user.SimpleEmployee; import groovy.util.logging.Slf4j; @@ -22,6 +20,11 @@ public class JucailinCockpitServiceimpl implements JucailinCockpitService { @Autowired private CockpitWorkDate4TypeCmd cockpitWorkDate4TypeCmd; + @Autowired + private CockpitDocumentAnalysisCmd cockpitDocumentAnalysisCmd; + + @Autowired + private CockpitWorkflowAnalysisCmd cockpitWorkflowAnalysisCmd; @Override public Map getMonthPerformanceData(SimpleEmployee simpleEmployee, Map paramMap,String tenantKey) { @@ -44,7 +47,14 @@ public class JucailinCockpitServiceimpl implements JucailinCockpitService { @Override public Map getWorkflowAnalysis(SimpleEmployee simpleEmployee, Map paramMap, String tenantKey) { - Map dataMap = cockpitWorkDate4TypeCmd.getDataInfo(simpleEmployee,paramMap,tenantKey); + Map dataMap = cockpitWorkflowAnalysisCmd.getDataInfo(simpleEmployee,paramMap,tenantKey); + return dataMap; + } + + + @Override + public Map getDocmentAnalysis(SimpleEmployee simpleEmployee, Map paramMap, String tenantKey) { + Map dataMap = cockpitDocumentAnalysisCmd.getDataInfo(simpleEmployee,paramMap,tenantKey); return dataMap; }