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

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitMonthPerformanceInfoCmd.java

@@ -39,7 +39,8 @@ public class CockpitMonthPerformanceInfoCmd {
             userList.add(employeeId);
 
             LocalDate currentDate = LocalDate.now();
-            Map<String, Object> scoreMap = new HashMap<String, Object>();
+            List<Map<String, Object>> scoreList = new ArrayList<Map<String, Object>>();
+            Map<String, Object> scoreMap = null;
             for (int i = 0; i < 6; i++) {
                 LocalDate lastLocalDate = currentDate.minus(i, ChronoUnit.MONTHS); // 当前日期减去6个月
                 LocalDate startDay = lastLocalDate.with(TemporalAdjusters.firstDayOfMonth()); // 计算当前月份的首日
@@ -62,9 +63,12 @@ public class CockpitMonthPerformanceInfoCmd {
                 }
                 log.error("currentMonth:"+currentMonth);
 
-                scoreMap.put(currentMonth,score);
+                scoreMap = new HashMap<String, Object>();
+                scoreMap.put("month",currentMonth);
+                scoreMap.put("score",score);
+                scoreList.add(scoreMap);
             }
-            dataMap.put("datas",scoreMap);
+            dataMap.put("datas",scoreList);
 
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/weaver/seconddev/cockpit/controller/JucailinCockpitController.java

@@ -133,6 +133,22 @@ public class JucailinCockpitController {
     }
 
 
+    @GetMapping("/getUserData")
+    @WeaPermission(publicPermission = true)
+    public WeaResult<Object> getUserData(HttpServletRequest request){
+        log.error("getWorkData");
+        Map<String, Object> dataList = new HashMap<String, Object>();
+        SimpleEmployee simpleEmployee = UserContext.getCurrentUser();
+        Map<String,Object> params = jucailinCockpitUtils.request2Map(request);
+
+        try{
+            dataList = jucailinCockpitService.getUserData(simpleEmployee,params,tenant_key);
+        }catch (Exception e){
+            log.error("getWorkData-Exception:"+e.getMessage());
+        }
+        return WeaResult.success(dataList);
+    }
+
 
 
     @GetMapping("/getBlogData")

src/main/java/com/weaver/seconddev/cockpit/service/JucailinCockpitService.java

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

src/main/java/com/weaver/seconddev/cockpit/service/impl/JucailinCockpitServiceimpl.java

@@ -58,6 +58,12 @@ public class JucailinCockpitServiceimpl implements JucailinCockpitService {
         return dataMap;
     }
 
+    @Override
+    public Map<String, Object> getUserData(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) {
+        Map<String,Object> dataMap = cockpitWorkDate4TypeCmd.getDataInfo(simpleEmployee,paramMap,tenantKey);
+        return dataMap;
+    }
+
     @Override
     public Map<String, Object> getBlogData(SimpleEmployee simpleEmployee, Map<String, Object> paramMap, String tenantKey) {
         Map<String,Object> dataMap = cockpitWorkDate4TypeCmd.getDataInfo(simpleEmployee,paramMap,tenantKey);