修改查看吞吐量曲线图

logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java

@@ -35,6 +35,9 @@ public class MbpsDto {
         private Byte queryType;
         @ApiModelProperty("查询的天数")
         private Integer queryOfDay = 10;
+        @NotNull(message = "请选择园区")
+        @ApiModelProperty("园区id(0现海园区,1晋恒通园区)")
+        private Long parkId;
 
     }
 

logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java

@@ -49,36 +49,40 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper {
      * @param queryType 查询类型
      * @param nowDate 现在的时间
      * @param  countArr 查询的天数
+     * @param parkId 园区id
      * @return 该时间车辆吞进量
      */
-    List<MbpsVo.CarOfInByTime> selCarOfInByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
+    List<MbpsVo.CarOfInByTime> selCarOfInByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate,@Param("parkId") Long parkId);
 
     /**
      * 根据时间查询车辆吐出量
      *@param queryType 查询类型
      * @param nowDate 现在的时间
      * @param  countArr 查询的天数
+     * @param parkId 园区id
      * @return 该时间车辆吐出量
      */
-    List<MbpsVo.CarOfOutByTime> selCarOfOutByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
+    List<MbpsVo.CarOfOutByTime> selCarOfOutByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate,@Param("parkId") Long parkId);
 
     /**
      * 根据时间查询入货量
      * @param queryType 查询类型
      * @param nowDate 现在的时间
      * @param  countArr 查询的天数
+     * @param parkId 园区id
      * @return 该时间入货量
      */
-    List<MbpsVo.WeightOfInByTime> selWeightOfInByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
+    List<MbpsVo.WeightOfInByTime> selWeightOfInByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate,@Param("parkId") Long parkId);
 
     /**
      * 根据时间查询出货量
      * @param queryType 查询类型
      * @param nowDate 现在的时间
      * @param  countArr 查询的天数
+     * @param parkId 园区id
      * @return 该时间车辆出货量
      */
-    List<MbpsVo.WeightOfOutByTime> selWeightOfOutByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
+    List<MbpsVo.WeightOfOutByTime> selWeightOfOutByTime(@Param("queryType") Byte queryType,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate,@Param("parkId") Long parkId);
 
     /**
      * 批量加入车辆记录

logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java

@@ -106,13 +106,13 @@ public class MbpsService implements IMbpsService {
 
         MbpsVo.SelMbpsByTime selMbpsByTime = new MbpsVo.SelMbpsByTime();
         //查询吞进量
-        List<MbpsVo.CarOfInByTime> carOfInByTimeList = carRecordDao.selCarOfInByTime(param.getQueryType(),countArr,nowDate);
+        List<MbpsVo.CarOfInByTime> carOfInByTimeList = carRecordDao.selCarOfInByTime(param.getQueryType(),countArr,nowDate,param.getParkId());
         selMbpsByTime.getCarOfInsByTime().addAll(carOfInByTimeList);
         //查询吐出量
-        List<MbpsVo.CarOfOutByTime> carOfOutByTimeList = carRecordDao.selCarOfOutByTime(param.getQueryType(),countArr,nowDate);
+        List<MbpsVo.CarOfOutByTime> carOfOutByTimeList = carRecordDao.selCarOfOutByTime(param.getQueryType(),countArr,nowDate,param.getParkId());
         selMbpsByTime.getCarOfOutsByTime().addAll(carOfOutByTimeList);
         //查询入库吨数
-        List<MbpsVo.WeightOfInByTime> weightOfInByTimeList = carRecordDao.selWeightOfInByTime(param.getQueryType(),countArr,nowDate);
+        List<MbpsVo.WeightOfInByTime> weightOfInByTimeList = carRecordDao.selWeightOfInByTime(param.getQueryType(),countArr,nowDate,param.getParkId());
         for (MbpsVo.WeightOfInByTime weightOfInByTime : weightOfInByTimeList) {
             if (ObjectUtil.isNull(weightOfInByTime.getWeightOfIn())){
                 weightOfInByTime.setWeightOfIn(0L);
@@ -120,7 +120,7 @@ public class MbpsService implements IMbpsService {
         }
         selMbpsByTime.getWeightOfInsByTime().addAll(weightOfInByTimeList);
         //查询出货吨数
-        List<MbpsVo.WeightOfOutByTime> weightOfOutByTimeList =carRecordDao.selWeightOfOutByTime(param.getQueryType(),countArr,nowDate);
+        List<MbpsVo.WeightOfOutByTime> weightOfOutByTimeList =carRecordDao.selWeightOfOutByTime(param.getQueryType(),countArr,nowDate,param.getParkId());
         for (MbpsVo.WeightOfOutByTime weightOfOutByTime : weightOfOutByTimeList) {
             if (ObjectUtil.isNull(weightOfOutByTime.getWeightOfOut())){
                 weightOfOutByTime.setWeightOfOut(0L);

logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml

@@ -57,16 +57,16 @@
             ) AS tmp,
             ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
                 <if test="queryType==0">
-                    FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 0 AND cr.rec_status = 0
+                    FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 0 AND cr.rec_status = 0 AND cr.park_id = #{parkId}
                 </if>
                 <if test="queryType==1">
-                    FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 0  AND cr.rec_status =0
+                    FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 0  AND cr.rec_status =0 AND cr.park_id = #{parkId}
                 </if>
                 <if test="queryType==2">
-                    FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 0  AND cr.rec_status =0
+                    FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 0  AND cr.rec_status =0 AND cr.park_id = #{parkId}
                 </if>
                 <if test="queryType==3">
-                    FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 0  AND cr.rec_status =0
+                    FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 0  AND cr.rec_status =0 AND cr.park_id = #{parkId}
                 </if>
         GROUP BY s.date ORDER BY s.date
     </select>
@@ -98,16 +98,16 @@
             ) AS tmp,
             ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
             <if test="queryType==0">
-                FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 1 AND cr.rec_status = 0
+                FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 1 AND cr.rec_status = 0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==1">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 1  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 1  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==2">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 1  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 1  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==3">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 1  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 1  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
         GROUP BY s.date ORDER BY s.date
     </select>
@@ -139,16 +139,16 @@
             ) AS tmp,
             ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
             <if test="queryType==0">
-                FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 0 AND cr.rec_status = 0
+                FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 0 AND cr.rec_status = 0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==1">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 0  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 0  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==2">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 0  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 0  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==3">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 0  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 0  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
         GROUP BY s.date ORDER BY s.date
     </select>
@@ -180,16 +180,16 @@
             ) AS tmp,
             ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
             <if test="queryType==0">
-                FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 1 AND cr.rec_status = 0
+                FROM_UNIXTIME( cr.record_time / 1000, '%Y-%m-%d' ) = s.date AND cr.in_out = 1 AND cr.rec_status = 0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==1">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 1  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y-%u') = s.date AND cr.in_out = 1  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==2">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 1  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y-%m') = s.date AND cr.in_out = 1  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             <if test="queryType==3">
-                FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 1  AND cr.rec_status =0
+                FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 1  AND cr.rec_status =0 AND cr.park_id = #{parkId}
             </if>
             GROUP BY s.date ORDER BY s.date
     </select>