:sparkles: 统计流量统计吨位接口

ghjg-item-server/src/main/java/com/shanghaichengdi/ghjgitem/mapper/FlowMonitoringStatisticsMapper.java

@@ -6,6 +6,7 @@ import com.shanghaichengdi.ghjgitem.vo.FlowMonitoringStatisticsVo;
 import java.util.List;
 import java.util.Map;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author gengaoliu
@@ -15,11 +16,11 @@ public interface FlowMonitoringStatisticsMapper {
 
   List<FlowMonitoringStatisticsVo> getAllPage(Map<String, Object> info);
 
-  List<RingData> getChart1();
+  List<RingData> getChart1(@Param("startTime") String startTime,@Param("endTime") String endTime);
 
   List<RingData> getChart2(Map<String, Object> map);
 
-  List<RingData> getChart3();
+  List<RingData> getChart3(@Param("startTime") String startTime,@Param("endTime") String endTime);
 
   List<RingData> getChart4(Map<String, Object> map);
 
@@ -27,7 +28,7 @@ public interface FlowMonitoringStatisticsMapper {
 
   List<RingData> origingetChart3(Map<String, Object> map);
 
-  List<RingData> getPieChartZd();
+  List<RingData> getPieChartZd(@Param("startTime") String startTime,@Param("endTime") String endTime);
 
-  List<RingData> getColumnChartZd();
+  List<RingData> getColumnChartZd(@Param("startTime") String startTime,@Param("endTime") String endTime);
 }

ghjg-item-server/src/main/java/com/shanghaichengdi/ghjgitem/service/impl/FlowMonitoringStatisticsServiceImpl.java

@@ -92,7 +92,7 @@ public class FlowMonitoringStatisticsServiceImpl implements IFlowMonitoringStati
 
   @Override
   public Map<String, List<RingDataDetails>> getChart1(Map<String, Object> map) {
-    List<RingData> chart1 = mapper.getChart1();
+    List<RingData> chart1 = mapper.getChart1((String) map.get("startTime"), (String) map.get("endTime"));
     Map<String, List<RingDataDetails>> listMap = new HashMap<>(5);
     for (BayonetType value : BayonetType.values()) {
       List<RingDataDetails> ringDataDetails = new ArrayList<>(2);
@@ -116,7 +116,7 @@ public class FlowMonitoringStatisticsServiceImpl implements IFlowMonitoringStati
 
   @Override
   public Map<String, List<RingDataDetails>> getChart3(Map<String, Object> map) {
-    List<RingData> chart3 = mapper.getChart3();
+    List<RingData> chart3 = mapper.getChart3((String) map.get("startTime"), (String) map.get("endTime"));
     Map<String, List<RingDataDetails>> listMap = new HashMap<>(5);
     for (BayonetType value : BayonetType.values()) {
       List<RingDataDetails> ringDataDetails = new ArrayList<>(7);
@@ -164,7 +164,7 @@ public class FlowMonitoringStatisticsServiceImpl implements IFlowMonitoringStati
 
   @Override
   public Map<String, List<RingDataDetails>> getPieChartZd(Map<String, Object> map) {
-    List<RingData> chart1 = mapper.getPieChartZd();
+    List<RingData> chart1 = mapper.getPieChartZd((String) map.get("startTime"), (String) map.get("endTime"));
     Map<String, List<RingDataDetails>> listMap = new HashMap<>(5);
     for (BayonetType value : BayonetType.values()) {
       List<RingDataDetails> ringDataDetails = new ArrayList<>(2);
@@ -183,7 +183,7 @@ public class FlowMonitoringStatisticsServiceImpl implements IFlowMonitoringStati
 
   @Override
   public Map<String, List<RingDataDetails>> getColumnChartZd(Map<String, Object> map) {
-    List<RingData> chart3 = mapper.getColumnChartZd();
+    List<RingData> chart3 = mapper.getColumnChartZd((String) map.get("startTime"), (String) map.get("endTime"));
     Map<String, List<RingDataDetails>> listMap = new HashMap<>(5);
     for (BayonetType value : BayonetType.values()) {
       List<RingDataDetails> ringDataDetails = new ArrayList<>(7);

ghjg-item-server/src/main/resources/mapper/FlowMonitoringStatisticsMapper.xml

@@ -62,7 +62,7 @@
 
   <select id="getPieChartZd" resultType="com.shanghaichengdi.ghjgitem.domain.RingData">
     select sb.name                                              bayonetName,
-           decode(info.DIRECTION, 1, '出沪艘次', 2, '入沪艘次') name,
+           decode(info.DIRECTION, 1, '出沪吨量', 2, '入沪吨量') name,
            sum(mvw.SHIP_GROSSTON)                               value
     from bayonet_dynamic.DATAFUSION info
            left join bayonet_basics.sys_bayonet sb on info.bayonet_id = sb.id