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

#E10-41# 接口优化

Browse Source
main
shilei 11 months ago
parent 3bf3c8ba9e
commit 17e67404e0
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java
Unescape Escape View File

@ -521,6 +521,7 @@ public class CockpitDocumentAnalysisCmd {
String groupId = "weaver-doc-service";
String sourceType = "LOGIC";
Long employeeId = employee.getEmployeeId();
log.error("employeeId:"+employeeId);
try {
String sql =" select p.folder,p.name,p.cou from ( \n" +
" select w.folder,w.name,w.cou \n" +
@ -534,6 +535,7 @@ public class CockpitDocumentAnalysisCmd {
" group by t.folder,l.name \n" +
" ) w order by w.cou desc \n" +
") p limit 5 " ;
log.error("sql:"+sql);
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
@ -551,7 +553,7 @@ public class CockpitDocumentAnalysisCmd {
} catch (Exception e) {
e.printStackTrace();
log.error("getDocCreateNum:" + e);
log.error("getRightViewData:" + e);
}
return recordList;
}

4
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java
Unescape Escape View File

@ -3,8 +3,6 @@ package com.weaver.seconddev.cockpit.cmd;
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.project.service.RemoteMainlineService;
import com.weaver.seconddev.cockpit.util.DatabaseUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import org.apache.commons.lang3.StringUtils;
@ -24,8 +22,6 @@ public class CockpitProjectDataCmd {
//日志
private final static Logger log = LoggerFactory.getLogger(CockpitProjectDataCmd.class);
@RpcReference
RemoteMainlineService remoteMainlineService ;
@Autowired
private DatabaseUtils databaseUtils;

11
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
Unescape Escape View File

@ -223,6 +223,15 @@ public class CockpitUserDataCmd {
}
try{
log.error("CockpitUserDataCmd-333333");
Long avatarid = employee.getAvatarId();
log.error("CockpitUserDataCmd-avatarid:"+avatarid);
String url = employee.getAvatar().getUrl();
log.error("CockpitUserDataCmd-url:"+url);
String avatarUrl = employee.getAvatar().getPreviewUrl();
log.error("CockpitUserDataCmd-test-avatarUrl:"+avatarUrl);
@ -242,7 +251,7 @@ public class CockpitUserDataCmd {
public List<Map<String,Object>> getCustomType(SimpleEmployee employee,String tenantKey){
List<Map<String,Object>> recordList = new ArrayList<Map<String,Object>>();
String groupId = "weaver-doc-service";
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
Long employeeId = employee.getEmployeeId();
try {

10
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java
Unescape Escape View File

@ -302,13 +302,14 @@ public class CockpitWorkflowAnalysisCmd {
*/
public List<Map<String,Object>> getRightViewData(SimpleEmployee employee,String tenantKey){
List<Map<String,Object>> recordList = new ArrayList<Map<String,Object>>();
String groupId = "weaver-doc-service";
String groupId = "weaver-workflow-report-serviceworkflowreport";
String sourceType = "LOGIC";
Long employeeId = employee.getEmployeeId();
log.error("employeeId2:"+employeeId);
try {
String sql =" select w.workflowid,w.workflowname,w.cou " +
" from (\n" +
" select p.workflowid,p.WORKFLOWNAME,p.cou\n" +
" select p.workflowid,p.workflowname,p.cou\n" +
" from (\n" +
" select t.workflowid,p.workflowname,count(1) as cou \n" +
" from wfc_requestbase t\n" +
@ -316,10 +317,11 @@ public class CockpitWorkflowAnalysisCmd {
" where t.userid = ? \n" +
" and delete_type = 0 \n" +
" and tenant_key= ? " +
" group by t.workflowid,p.WORKFLOWNAME\n" +
" group by t.workflowid,p.workflowname\n" +
" ) p order by p.cou desc \n" +
" ) w limit 5" ;
log.error("sql2:"+sql);
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.LONG);
@ -336,7 +338,7 @@ public class CockpitWorkflowAnalysisCmd {
} catch (Exception e) {
e.printStackTrace();
log.error("getRightViewData:" + e);
log.error("getRightViewData2:" + e);
}
return recordList;
}

4
src/main/java/com/weaver/seconddev/cockpit/util/JucailinCockpitUtils.java
Unescape Escape View File

@ -41,7 +41,6 @@ public class JucailinCockpitUtils {
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
try{
log.error("pkey:"+pkey);
if(StringUtils.isNotBlank(pkey))
{
String dataSql =" select pvalue \n" +
@ -50,8 +49,6 @@ public class JucailinCockpitUtils {
" and delete_type = 0 \n" +
" and tenant_key='"+tenant_key+"'" ;
log.error("dataSql:"+dataSql);
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
SqlParamEntity sqlParamEntity = new SqlParamEntity();
sqlParamEntity.setParamType(SqlParamType.VARCHAR);
@ -60,7 +57,6 @@ public class JucailinCockpitUtils {
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, dataSql,sqlparam);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
log.error("recordList:"+recordList.size());
if(CollectionUtils.isNotEmpty(recordList) && recordList.size() >0 ) {
Map<String,Object> recordMap = recordList.get(0);

Write Preview
Loading…
Cancel
Save