From 17e67404e021cb08b479099737be6fc8012ba4f9 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Fri, 31 May 2024 19:32:05 +0800 Subject: [PATCH] =?UTF-8?q?#E10-41#=20=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/cmd/CockpitDocumentAnalysisCmd.java | 4 +++- .../seconddev/cockpit/cmd/CockpitProjectDataCmd.java | 4 ---- .../seconddev/cockpit/cmd/CockpitUserDataCmd.java | 11 ++++++++++- .../cockpit/cmd/CockpitWorkflowAnalysisCmd.java | 10 ++++++---- .../seconddev/cockpit/util/JucailinCockpitUtils.java | 4 ---- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java index 6fbcc26..dda076b 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java @@ -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 sqlparam = new ArrayList(); 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; } diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java index 0b682b8..afd051d 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java @@ -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; diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java index 3a28b1a..b026347 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java @@ -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> getCustomType(SimpleEmployee employee,String tenantKey){ List> recordList = new ArrayList>(); - String groupId = "weaver-doc-service"; + String groupId = "weaver-ebuilder-form-service"; String sourceType = "LOGIC"; Long employeeId = employee.getEmployeeId(); try { diff --git a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java index 1472171..f830809 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java +++ b/src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java @@ -302,13 +302,14 @@ public class CockpitWorkflowAnalysisCmd { */ public List> getRightViewData(SimpleEmployee employee,String tenantKey){ List> recordList = new ArrayList>(); - 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 sqlparam = new ArrayList(); 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; } diff --git a/src/main/java/com/weaver/seconddev/cockpit/util/JucailinCockpitUtils.java b/src/main/java/com/weaver/seconddev/cockpit/util/JucailinCockpitUtils.java index 7fd2d75..8840b7f 100644 --- a/src/main/java/com/weaver/seconddev/cockpit/util/JucailinCockpitUtils.java +++ b/src/main/java/com/weaver/seconddev/cockpit/util/JucailinCockpitUtils.java @@ -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 sqlparam = new ArrayList(); SqlParamEntity sqlParamEntity = new SqlParamEntity(); sqlParamEntity.setParamType(SqlParamType.VARCHAR); @@ -60,7 +57,6 @@ public class JucailinCockpitUtils { Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql,sqlparam); List> recordList = databaseUtils.getDataSourceList(result); - log.error("recordList:"+recordList.size()); if(CollectionUtils.isNotEmpty(recordList) && recordList.size() >0 ) { Map recordMap = recordList.get(0);