Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -2,9 +2,17 @@ package com.epmet.datareport.controller.screen;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectOrgDailyService;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
 import com.epmet.dto.form.screen.CategoryAnalysisFormDTO;
+import com.epmet.dto.form.screen.EfficiencyAnalysisFormDTO;
+import com.epmet.dto.form.screen.QueryQuantityMonthlyFormDTO;
+import com.epmet.dto.form.screen.ScreenCommonFormDTO;
 import com.epmet.dto.result.screen.CategoryAnalysisResultDTO;
+import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO;
+import com.epmet.dto.result.screen.ProjectQuantityResultDTO;
+import com.epmet.dto.result.screen.QueryQuantityMonthlyResultDTO;
 import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO;
@@ -29,7 +37,10 @@ public class ScreenProjectController {
 
     @Autowired
     private ScreenProjectService screenProjectService;
-
+    @Autowired
+    private ScreenProjectOrgDailyService projectOrgDailyService;
+    @Autowired
+    private ScreenProjectQuantityOrgMonthlyService projectQuantityOrgMonthlyService;
     /**
      * @Description  3、项目详情
      * @param projectDetailFormDTO
@@ -77,4 +88,42 @@ public class ScreenProjectController {
         return new Result<List<CategoryAnalysisResultDTO>>().ok(screenProjectService.categoryAnalysis(customerId, formDTO));
     }
 
+
+    /**
+     * @param customerId
+     * @param formDTO
+     * @description 【事件分析】数量统计查询  平阴大屏
+     **/
+    @PostMapping("queryquantity")
+    public Result<ProjectQuantityResultDTO> queryQuantity(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCommonFormDTO formDTO){
+        formDTO.setCustomerId(customerId);
+        return new Result().ok(projectOrgDailyService.queryQuantity(formDTO));
+    }
+
+    /**
+     * @param customerId
+     * @param formDTO
+     * @author yinzuomei
+     * @description 近12个月【事件分析】月度数量分析  平阴大屏
+     **/
+    @PostMapping("queryquantity-monthly")
+    public Result<QueryQuantityMonthlyResultDTO> queryQuantityMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody QueryQuantityMonthlyFormDTO formDTO) {
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<QueryQuantityMonthlyResultDTO>().ok(projectQuantityOrgMonthlyService.queryQuantityMonthly(formDTO));
+    }
+
+    /**
+     * @param customerId
+     * @param formDTO
+     * @author yinzuomei
+     * @description  【事件分析】效率分析  平阴大屏
+     **/
+    @PostMapping("efficiency-analysis")
+    public Result<List<EfficiencyAnalysisResultDTO>> efficiencyAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody EfficiencyAnalysisFormDTO formDTO){
+        formDTO.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<EfficiencyAnalysisResultDTO>>().ok(projectOrgDailyService.efficiencyAnalysis(formDTO));
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectQuantityOrgMonthlyServiceImpl.java

@@ -32,10 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -74,20 +71,27 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl implements ScreenProject
         Map<String, ScreenProjectQuantityOrgMonthlyDTO> dtoMap = new HashMap<>();
         if (!CollectionUtils.isEmpty(dtoList)) {
             dtoMap = dtoList.stream().collect(Collectors.toMap(ScreenProjectQuantityOrgMonthlyDTO::getMonthId, Function.identity(), (key1, key2) -> key2));
+            List<String> blank = dtoMap.keySet().stream().filter(query -> !monthIdList.contains(query)).collect(Collectors.toList());
+            if(!CollectionUtils.isEmpty(blank)){
+                for(int i = NumConstant.ZERO; i < blank.size(); i++){dtoMap.put(blank.get(i),null);}
+            }
+        }else{
+            for(int i = NumConstant.ZERO; i < monthIdList.size(); i++){dtoMap.put(monthIdList.get(i),null);}
         }
         for (String monthId : monthIdList) {
             //202101=>01月
             xAxis.add(monthId.substring(NumConstant.FOUR, NumConstant.SIX).concat(ScreenConstant.MONTH));
             if (!CollectionUtils.isEmpty(dtoList)) {
+                ScreenProjectQuantityOrgMonthlyDTO en = dtoMap.get(monthId);
                 if ("incr".equals(formDTO.getType())) {
-                    yAxis.add(dtoMap.get(monthId).getProjectIncr());
+                    yAxis.add( null == en ? NumConstant.ZERO : en.getProjectIncr());
                 } else if ("sum".equals(formDTO.getType())) {
-                    yAxis.add(dtoMap.get(monthId).getProjectTotal());
+                    yAxis.add( null == en ? NumConstant.ZERO : en.getProjectTotal() );
                 }
                 continue;
             }
             //没有数据默认赋值0
-            yAxis.add(0);
+            //yAxis.add(0);
         }
         resultDTO.setXAxis(xAxis);
         resultDTO.setYAxis(yAxis);