ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

修改查看吞吐量曲线图

logistics
ma 4 years ago
parent
d1d11ec4fb
commit
105bea07dd
4 changed files with 31 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java
  2. 12
      logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java
  3. 8
      logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java
  4. 32
      logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml

3
logistics/src/main/java/com/ccsens/logistics/bean/dto/MbpsDto.java
View File

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

12
logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsCarRecordDao.java
View File

@ -49,36 +49,40 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper {
* @param queryType 查询类型 * @param queryType 查询类型
* @param nowDate 现在的时间 * @param nowDate 现在的时间
* @param countArr 查询的天数 * @param countArr 查询的天数
* @param parkId 园区id
* @return 该时间车辆吞进量 * @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 queryType 查询类型
* @param nowDate 现在的时间 * @param nowDate 现在的时间
* @param countArr 查询的天数 * @param countArr 查询的天数
* @param parkId 园区id
* @return 该时间车辆吐出量 * @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 queryType 查询类型
* @param nowDate 现在的时间 * @param nowDate 现在的时间
* @param countArr 查询的天数 * @param countArr 查询的天数
* @param parkId 园区id
* @return 该时间入货量 * @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 queryType 查询类型
* @param nowDate 现在的时间 * @param nowDate 现在的时间
* @param countArr 查询的天数 * @param countArr 查询的天数
* @param parkId 园区id
* @return 该时间车辆出货量 * @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);
/** /**
* 批量加入车辆记录 * 批量加入车辆记录

8
logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java
View File

@ -106,13 +106,13 @@ public class MbpsService implements IMbpsService {
MbpsVo.SelMbpsByTime selMbpsByTime = new MbpsVo.SelMbpsByTime(); 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); 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); 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) { for (MbpsVo.WeightOfInByTime weightOfInByTime : weightOfInByTimeList) {
if (ObjectUtil.isNull(weightOfInByTime.getWeightOfIn())){ if (ObjectUtil.isNull(weightOfInByTime.getWeightOfIn())){
weightOfInByTime.setWeightOfIn(0L); weightOfInByTime.setWeightOfIn(0L);
@ -120,7 +120,7 @@ public class MbpsService implements IMbpsService {
} }
selMbpsByTime.getWeightOfInsByTime().addAll(weightOfInByTimeList); 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) { for (MbpsVo.WeightOfOutByTime weightOfOutByTime : weightOfOutByTimeList) {
if (ObjectUtil.isNull(weightOfOutByTime.getWeightOfOut())){ if (ObjectUtil.isNull(weightOfOutByTime.getWeightOfOut())){
weightOfOutByTime.setWeightOfOut(0L); weightOfOutByTime.setWeightOfOut(0L);

32
logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml
View File

@ -57,16 +57,16 @@
) AS tmp, ) AS tmp,
( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
<if test="queryType==0"> <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>
<if test="queryType==1"> <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>
<if test="queryType==2"> <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>
<if test="queryType==3"> <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> </if>
GROUP BY s.date ORDER BY s.date GROUP BY s.date ORDER BY s.date
</select> </select>
@ -98,16 +98,16 @@
) AS tmp, ) AS tmp,
( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
<if test="queryType==0"> <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>
<if test="queryType==1"> <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>
<if test="queryType==2"> <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>
<if test="queryType==3"> <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> </if>
GROUP BY s.date ORDER BY s.date GROUP BY s.date ORDER BY s.date
</select> </select>
@ -139,16 +139,16 @@
) AS tmp, ) AS tmp,
( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
<if test="queryType==0"> <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>
<if test="queryType==1"> <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>
<if test="queryType==2"> <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>
<if test="queryType==3"> <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> </if>
GROUP BY s.date ORDER BY s.date GROUP BY s.date ORDER BY s.date
</select> </select>
@ -180,16 +180,16 @@
) AS tmp, ) AS tmp,
( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON ( SELECT @i := + 1 ) t ) AS s LEFT JOIN t_logistics_car_record AS cr ON
<if test="queryType==0"> <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>
<if test="queryType==1"> <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>
<if test="queryType==2"> <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>
<if test="queryType==3"> <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> </if>
GROUP BY s.date ORDER BY s.date GROUP BY s.date ORDER BY s.date
</select> </select>

Write Preview
Loading…
Cancel
Save