shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#E10-38# 驾驶舱接口优化

Browse Source
main
shilei 1 year ago
parent 91cf0aa042
commit a1e1732b51
5 changed files with 85 additions and 40 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java
Unescape Escape View File

@ -64,7 +64,8 @@ public class CockpitMonthPerformanceInfoCmd {
scoreMap.put(currentMonth,score); scoreMap.put(currentMonth,score);
} }
dataMap.put("score",dataMap); dataMap.put("datas",scoreMap);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("PortalPerformanceInfoCmd :" + e); log.error("PortalPerformanceInfoCmd :" + e);

80
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkAchievementsCmd.java
Unescape Escape View File

@ -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.entity.SqlParamEntity;
import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils; import com.weaver.seconddev.cockpit.util.DatabaseUtils;
import com.weaver.seconddev.jcldoor.util.JucailinPortalUtils; import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils;
import com.weaver.teams.domain.hr.entity.FlowData; import com.weaver.teams.domain.hr.entity.FlowData;
import com.weaver.teams.domain.hr.entity.FlowDataListReq; import com.weaver.teams.domain.hr.entity.FlowDataListReq;
import com.weaver.teams.domain.hr.entity.FlowDataListRes; import com.weaver.teams.domain.hr.entity.FlowDataListRes;
@ -45,7 +45,7 @@ public class CockpitWorkAchievementsCmd {
public RemotePerformanceService remotePerformanceService; public RemotePerformanceService remotePerformanceService;
@Autowired @Autowired
private JucailinPortalUtils jucailinPortalUtils; private JucailinCockpitUtils jucailinCockpitUtils;
@Autowired @Autowired
private DatabaseUtils databaseUtils; private DatabaseUtils databaseUtils;
@ -58,11 +58,11 @@ public class CockpitWorkAchievementsCmd {
Map<String, Object> recordMap = new HashMap<String, Object>(); Map<String, Object> recordMap = new HashMap<String, Object>();
List<Map<String,String>> list = new ArrayList<>(100); List<Map<String,String>> list = new ArrayList<Map<String,String>>(100);
Map<String,String> oneMap = new HashMap<>(100); Map<String,String> oneMap = new HashMap<String,String>(100);
Map<String,String> twoMap = new HashMap<>(100); Map<String,String> twoMap = new HashMap<String,String>(100);
Map<String,String> threeMap = new HashMap<>(100); Map<String,String> threeMap = new HashMap<String,String>(100);
Map<String,String> fourMap = new HashMap<>(100); Map<String,String> fourMap = new HashMap<String,String>(100);
String startday = String.valueOf(paramMap.get("startday")); String startday = String.valueOf(paramMap.get("startday"));
@ -96,118 +96,130 @@ public class CockpitWorkAchievementsCmd {
one = getQuestInfo(startday, endday, employeeId,tenantKey); one = getQuestInfo(startday, endday, employeeId,tenantKey);
oneword = "本年问题处理数"; oneword = "本年问题处理数";
String pkey = "workdata.technology.wtclsl"; String pkey = "workdata.technology.wtclsl";
oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
two = getDaysInfo(startday, endday, employeeId,tenantKey); two = getDaysInfo(startday, endday, employeeId,tenantKey);
twoword = "本年开发人天"; twoword = "本年开发人天";
pkey = "workdata.technology.kfrt"; pkey = "workdata.technology.kfrt";
twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getCoWorkInfo(startday,endday, employeeId,tenantKey); three = getCoWorkInfo(startday,endday, employeeId,tenantKey);
threeword = "本年协作沟通数"; threeword = "本年协作沟通数";
pkey = "workdata.technology.gtxz"; pkey = "workdata.technology.gtxz";
threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
four = getWfInfo(simpleEmployee); four = getWfInfo(simpleEmployee);
fourword = "本年处理流程数"; fourword = "本年处理流程数";
pkey = "workdata.technology.cllc"; pkey = "workdata.technology.cllc";
foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
}else if("1".equals(znlx)){ }else if("1".equals(znlx)){
one = "0.00"; one = "0.00";
oneword = "本年验收指标"; oneword = "本年验收指标";
String pkey = "workdata.project.yszb"; String pkey = "workdata.project.yszb";
oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
//项目验收信息 //项目验收信息
two = getYsInfo(employeeId,startday,endday); two = getYsInfo(employeeId,startday,endday);
two = parseJe(two); two = parseJe(two);
log.error("four:"+four);
twoword = "本年验收金额"; twoword = "本年验收金额";
pkey = "workdata.project.ysje"; pkey = "workdata.project.ysje";
twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = "0.00"; three = "0.00";
threeword = "本年指标达成率"; threeword = "本年指标达成率";
pkey = "workdata.project.zbdcl"; pkey = "workdata.project.zbdcl";
threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
//项目收款信息 //项目收款信息
four = getSkInfo(employeeId,startday,endday,tenantKey); four = getSkInfo(employeeId,startday,endday,tenantKey);
log.error("four:"+four);
four = parseJe(four); four = parseJe(four);
log.error("four2:"+four);
fourword = "本年收款金额"; fourword = "本年收款金额";
pkey = "workdata.project.skje"; pkey = "workdata.project.skje";
foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
}else if("3".equals(znlx)){ }else if("3".equals(znlx)){
one = getWfInfo(simpleEmployee); one = getWfInfo(simpleEmployee);
oneword = "本年处理流程数"; oneword = "本年处理流程数";
String pkey = "workdata.other.cllc"; String pkey = "workdata.other.cllc";
oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
two = getDocInfo(startday,endday,employeeId,tenantKey); two = getDocInfo(startday,endday,employeeId,tenantKey);
twoword = "本年文档贡献度"; twoword = "本年文档贡献度";
pkey = "workdata.other.wdgx"; pkey = "workdata.other.wdgx";
twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getDailyInfo(startday,endday,employeeId,tenantKey); three = getDailyInfo(startday,endday,employeeId,tenantKey);
threeword = "本年微博填写数"; threeword = "本年微博填写数";
pkey = "workdata.other.wbtx"; pkey = "workdata.other.wbtx";
threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
four = getCoWorkInfo(startday,endday,employeeId,tenantKey); four = getCoWorkInfo(startday,endday,employeeId,tenantKey);
fourword = "本年沟通协作数"; fourword = "本年沟通协作数";
pkey = "workdata.other.gtxz"; pkey = "workdata.other.gtxz";
foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
}else{ }else{
one = getWfInfo(simpleEmployee); one = getWfInfo(simpleEmployee);
oneword = "本年处理流程数"; oneword = "本年处理流程数";
String pkey = "workdata.other.cllc"; String pkey = "workdata.other.cllc";
oneurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); oneurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
two = getDocInfo(startday,endday,employeeId,tenantKey); two = getDocInfo(startday,endday,employeeId,tenantKey);
twoword = "本年文档贡献度"; twoword = "本年文档贡献度";
pkey = "workdata.other.wdgx"; pkey = "workdata.other.wdgx";
twourl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); twourl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
three = getDailyInfo(startday,endday,employeeId,tenantKey); three = getDailyInfo(startday,endday,employeeId,tenantKey);
threeword = "本年微博填写数"; threeword = "本年微博填写数";
pkey = "workdata.other.wbtx"; pkey = "workdata.other.wbtx";
threeurl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); threeurl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
four = getCoWorkInfo(startday,endday,employeeId,tenantKey); four = getCoWorkInfo(startday,endday,employeeId,tenantKey);
fourword = "本年沟通协作数"; fourword = "本年沟通协作数";
pkey = "workdata.other.gtxz"; pkey = "workdata.other.gtxz";
foururl = jucailinPortalUtils.getUfPropData(pkey,tenantKey); foururl = jucailinCockpitUtils.getUfPropData(pkey,tenantKey);
} }
oneMap.put("name",oneword); oneMap.put("name",oneword);
oneMap.put("value",one); oneMap.put("value",one);
oneMap.put("url",oneurl); oneMap.put("url",oneurl);
log.error("1111");
twoMap.put("name",twoword); twoMap.put("name",twoword);
twoMap.put("value",two); twoMap.put("value",two);
twoMap.put("url",twourl); twoMap.put("url",twourl);
log.error("2222");
threeMap.put("name",threeword); threeMap.put("name",threeword);
threeMap.put("value",three); threeMap.put("value",three);
threeMap.put("url",threeurl); threeMap.put("url",threeurl);
log.error("3333");
fourMap.put("name",fourword); fourMap.put("name",fourword);
fourMap.put("value",four); fourMap.put("value",four);
fourMap.put("url",foururl); fourMap.put("url",foururl);
log.error("4444");
list.add(oneMap); list.add(oneMap);
list.add(twoMap); list.add(twoMap);
list.add(threeMap); list.add(threeMap);
list.add(fourMap); list.add(fourMap);
recordMap.put("list",list); recordMap.put("datas",list);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("PortalPerformanceInfoCmd :" + e); log.error("CockpitWorkAchievementsCmd :" + e);
} }
return recordMap; return recordMap;
} }
@ -324,7 +336,7 @@ public class CockpitWorkAchievementsCmd {
try{ try{
long formdata = employee.getFormdata(); long formdata = employee.getFormdata();
String pkey = "field69.groupId"; String pkey = "field69.groupId";
String groupId = jucailinPortalUtils.getUfPropData(pkey,tenantkey); String groupId = jucailinCockpitUtils.getUfPropData(pkey,tenantkey);
log.error("groupId:"+groupId); log.error("groupId:"+groupId);
String field69 = ""; String field69 = "";
@ -527,7 +539,7 @@ public class CockpitWorkAchievementsCmd {
String groupId = "weaver-ebuilder-form-service"; String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC"; String sourceType = "LOGIC";
String htzje = "0.00"; String skje = "0.00";
try { try {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
@ -601,16 +613,18 @@ public class CockpitWorkAchievementsCmd {
strlist.add(employeeId); strlist.add(employeeId);
List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist); List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result); List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
log.error("recordList:"+recordList.size());
if(!CollectionUtils.isEmpty(recordList)){ 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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("PorojectReceiptsInfoCmd Exception:"+e); log.error("PorojectReceiptsInfoCmd Exception:"+e);
} }
return htzje; return skje;
} }

22
src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java
Unescape Escape View File

@ -84,7 +84,7 @@ public class JucailinCockpitController {
@GetMapping("/getUserData4Type") @GetMapping("/getUserData4Type")
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)
public WeaResult<Object> getUserData4Type(HttpServletRequest request){ public WeaResult<Object> getUserData4Type(HttpServletRequest request){
log.error("getWorkData"); log.error("getUserData4Type");
Map<String, Object> dataList = new HashMap<String, Object>(); Map<String, Object> dataList = new HashMap<String, Object>();
SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser();
Map<String,Object> params = jucailinCockpitUtils.request2Map(request); Map<String,Object> params = jucailinCockpitUtils.request2Map(request);
@ -102,7 +102,7 @@ public class JucailinCockpitController {
@GetMapping("/getWorkflowAnalysis") @GetMapping("/getWorkflowAnalysis")
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)
public WeaResult<Object> getWorkflowAnalysis(HttpServletRequest request){ public WeaResult<Object> getWorkflowAnalysis(HttpServletRequest request){
log.error("getWorkData"); log.error("getWorkflowAnalysis");
Map<String, Object> dataList = new HashMap<String, Object>(); Map<String, Object> dataList = new HashMap<String, Object>();
SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); SimpleEmployee simpleEmployee = UserContext.getCurrentUser();
Map<String,Object> params = jucailinCockpitUtils.request2Map(request); Map<String,Object> params = jucailinCockpitUtils.request2Map(request);
@ -116,6 +116,24 @@ public class JucailinCockpitController {
} }
@GetMapping("/getDocmentAnalysis")
@WeaPermission(publicPermission = true)
public WeaResult<Object> getDocmentAnalysis(HttpServletRequest request){
log.error("getDocmentAnalysis");
Map<String, Object> dataList = new HashMap<String, Object>();
SimpleEmployee simpleEmployee = UserContext.getCurrentUser();
Map<String,Object> 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") @GetMapping("/getBlogData")
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)

2
src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java
Unescape Escape View File

@ -14,6 +14,8 @@ public interface JucailinCockpitService {
Map<String, Object> getWorkflowAnalysis(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey); Map<String, Object> getWorkflowAnalysis(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey);
Map<String, Object> getDocmentAnalysis(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey);
Map<String, Object> getBlogData(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey); Map<String, Object> getBlogData(SimpleEmployee simpleEmployee,Map<String,Object> paramMap,String tenantKey);
} }

18
src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java
Unescape Escape View File

@ -1,8 +1,6 @@
package com.weaver.seconddev.cockpit.service.impl; package com.weaver.seconddev.cockpit.service.impl;
import com.weaver.seconddev.cockpit.cmd.CockpitMonthPerformanceInfoCmd; import com.weaver.seconddev.cockpit.cmd.*;
import com.weaver.seconddev.cockpit.cmd.CockpitWorkAchievementsCmd;
import com.weaver.seconddev.cockpit.cmd.CockpitWorkDate4TypeCmd;
import com.weaver.seconddev.cockpit.service.JucailinCockpitService; import com.weaver.seconddev.cockpit.service.JucailinCockpitService;
import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.domain.user.SimpleEmployee;
import groovy.util.logging.Slf4j; import groovy.util.logging.Slf4j;
@ -22,6 +20,11 @@ public class JucailinCockpitServiceimpl implements JucailinCockpitService {
@Autowired @Autowired
private CockpitWorkDate4TypeCmd cockpitWorkDate4TypeCmd; private CockpitWorkDate4TypeCmd cockpitWorkDate4TypeCmd;
@Autowired
private CockpitDocumentAnalysisCmd cockpitDocumentAnalysisCmd;
@Autowired
private CockpitWorkflowAnalysisCmd cockpitWorkflowAnalysisCmd;
@Override @Override
public Map<String, Object> getMonthPerformanceData(SimpleEmployee simpleEmployee, Map<String, Object> paramMap,String tenantKey) { public Map<String, Object> getMonthPerformanceData(SimpleEmployee simpleEmployee, Map<String, Object> paramMap,String tenantKey) {
@ -44,7 +47,14 @@ public class JucailinCockpitServiceimpl implements JucailinCockpitService {
@Override @Override
public Map<String, Object> getWorkflowAnalysis(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) { public Map<String, Object> getWorkflowAnalysis(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) {
Map<String,Object> dataMap = cockpitWorkDate4TypeCmd.getDataInfo(simpleEmployee,paramMap,tenantKey); Map<String,Object> dataMap = cockpitWorkflowAnalysisCmd.getDataInfo(simpleEmployee,paramMap,tenantKey);
return dataMap;
}
@Override
public Map<String, Object> getDocmentAnalysis(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) {
Map<String,Object> dataMap = cockpitDocumentAnalysisCmd.getDataInfo(simpleEmployee,paramMap,tenantKey);
return dataMap; return dataMap;
} }

Write Preview
Loading…
Cancel
Save