【CHG】需求变更

railway-business/src/main/java/com/railway/business/bi/mapper/ShowBdycMapper.java

@@ -5,6 +5,7 @@ import com.railway.business.bi.domain.ShowBdyc;
 import com.railway.business.bi.domain.dto.DlycDTO;
 import com.railway.business.bi.domain.vo.BdycQuery;
 import com.railway.business.bi.domain.vo.YcxxTotalVO;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -49,5 +50,8 @@ public interface ShowBdycMapper {
 
   List<String> getLineList(BdycQuery showBdyc);
 
-  List<YcxxTotalVO> getTotal();
+  /**
+   * @param foundMode 发现方式:0调度推送,1自主发现
+   */
+  List<YcxxTotalVO> getTotal(@Param("foundMode") String foundMode);
 }

railway-business/src/main/java/com/railway/business/bi/mapper/ShowDlycMapper.java

@@ -49,6 +49,9 @@ public interface ShowDlycMapper {
 
   List<String> getLineList(DlycQuery showBdyc);
 
-  List<YcxxTotalVO> getTotal();
+  /**
+   * @param foundMode 发现方式:0调度推送,1自主发现
+   */
+  List<YcxxTotalVO> getTotal(@Param("foundMode") String foundMode);
 
 }

railway-business/src/main/java/com/railway/business/bi/service/impl/ChartServiceImpl.java

@@ -8,6 +8,7 @@ import com.railway.business.bi.domain.vo.SbxjVO;
 import com.railway.business.bi.domain.vo.SingleTotalVO;
 import com.railway.business.bi.domain.vo.TodoListVO;
 import com.railway.business.bi.domain.vo.YcxxTotalVO;
+import com.railway.business.bi.enums.YcxxFoundModeEnum;
 import com.railway.business.bi.mapper.ShowBdycMapper;
 import com.railway.business.bi.mapper.ShowBpdjxjhMapper;
 import com.railway.business.bi.mapper.ShowDlycMapper;
@@ -171,17 +172,27 @@ public class ChartServiceImpl implements IChartService {
     xAxis.add("二级");
     xAxis.add("三级");
 
-    List<YcxxTotalVO> bdTotal = bdycMapper.getTotal();
-    List<Integer> zsData = getData(bdTotal);
+    List<YcxxTotalVO> ddtsbdTotal = bdycMapper.getTotal(YcxxFoundModeEnum.PUSH.getCode());
+    List<Integer> ddtsbdData = getData(ddtsbdTotal);
 
-    List<YcxxTotalVO> dlTotal = dlycMapper.getTotal();
-    List<Integer> ytData = getData(dlTotal);
+    List<YcxxTotalVO> zzfsbdTotal = bdycMapper.getTotal(YcxxFoundModeEnum.SELF.getCode());
+    List<Integer> zzfsbdData = getData(zzfsbdTotal);
+
+    List<YcxxTotalVO> ddtsdlTotal = dlycMapper.getTotal(YcxxFoundModeEnum.PUSH.getCode());
+    List<Integer> ddtsdlData = getData(ddtsdlTotal);
+
+    List<YcxxTotalVO> zzfsdlTotal = dlycMapper.getTotal(YcxxFoundModeEnum.SELF.getCode());
+    List<Integer> zzfsdlData = getData(zzfsdlTotal);
 
     List<SeriesDTO> series = new ArrayList<>();
-    SeriesDTO zs = createSeriesDTO(xAxis, zsData, "变电");
-    SeriesDTO yt = createSeriesDTO(xAxis, ytData, "电力");
-    series.add(zs);
-    series.add(yt);
+    SeriesDTO ddtsbd = createSeriesDTO(xAxis, ddtsbdData, "调度推送变电");
+    SeriesDTO zzfxbd = createSeriesDTO(xAxis, zzfsbdData, "自主发现变电");
+    SeriesDTO ddtsdl = createSeriesDTO(xAxis, ddtsdlData, "调度推送电力");
+    SeriesDTO zzfxdl = createSeriesDTO(xAxis, zzfsdlData, "自主发现电力");
+    series.add(ddtsbd);
+    series.add(zzfxbd);
+    series.add(ddtsdl);
+    series.add(zzfxdl);
 
     String name = "今日遗留";
     return createChartVO(xAxis, series, name);

railway-business/src/main/resources/mapper/bi/ShowBdycMapper.xml

@@ -296,6 +296,7 @@
     FROM show_bdyc
     where del_flag = '0'
       and rectify_result='未处理'
+      and found_mode=#{foundMode}
       and file_id = (select max(id) from show_file where data_type = 'yctj' and imp_result = '1')
     group by qxdj;
   </select>

railway-business/src/main/resources/mapper/bi/ShowDlycMapper.xml

@@ -284,6 +284,7 @@
     FROM show_dlyc
     where del_flag = '0'
       and rectify_result='未处理'
+      and found_mode=#{foundMode}
       and file_id = (select max(id) from show_file where data_type = 'yctj' and imp_result = '1')
     group by gravity;
   </select>