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

修改查询总吞吐量接口

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

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

@ -36,6 +36,7 @@ public class MbpsDto {
@Data
@ApiModel(value = "查看温度和湿度")
public static class SelTeamAndHumidity{
@NotNull(message = "请选择要查询的园区")
@ApiModelProperty("园区id")
private Long parkId;
@NotNull(message = "请选择要查询的仓库")

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

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author 马
*/
@ -13,6 +15,7 @@ public class WarehouseDto {
@Data
@ApiModel("查询仓库")
public static class SelWarehouse{
@NotNull(message = "请选择要查询的园区")
@ApiModelProperty("园区id")
private Long parkId;
@ApiModelProperty("仓库id")

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

@ -20,34 +20,36 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper {
* @param warehouseId 仓库id
* @return 车辆吞进量
*/
Long selCarOfIn(Long warehouseId);
Long selCarOfIn(@Param("warehouseId") Long warehouseId);
/**
* 查询车辆吐出量
* @param warehouseId 仓库id
* @return 车辆吐出量
*/
Long selCarOfOut(Long warehouseId);
Long selCarOfOut(@Param("warehouseId") Long warehouseId);
/**
* 查询入库吨数
* @param warehouseId 仓库id
* @return 入库吨数
*/
Long selWeightOfIn(Long warehouseId);
Long selWeightOfIn(@Param("warehouseId") Long warehouseId);
/**
* 查询出货吨数
* @param warehouseId 仓库id
* @return 出货吨数
*/
Long selWeightOfOut(Long warehouseId);
Long selWeightOfOut(@Param("warehouseId") Long warehouseId);
/**
* 根据时间查询车辆吞进量
* @param queryType 查询类型
* @param startTime 开始时间
* @param endTime 结束时间
* @param nowDate 现在的时间
* @param countArr 查询的天数
* @return 该时间车辆吞进量
*/
List<MbpsVo.CarOfInByTime> selCarOfInByTime(@Param("queryType") Byte queryType, @Param("startTime") Long startTime, @Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
@ -57,6 +59,8 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper {
*@param queryType 查询类型
* @param startTime 开始时间
* @param endTime 结束时间
* @param nowDate 现在的时间
* @param countArr 查询的天数
* @return 该时间车辆吐出量
*/
List<MbpsVo.CarOfOutByTime> selCarOfOutByTime(@Param("queryType") Byte queryType,@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
@ -66,6 +70,8 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper {
* @param queryType 查询类型
* @param startTime 开始时间
* @param endTime 结束时间
* @param nowDate 现在的时间
* @param countArr 查询的天数
* @return 该时间入货量
*/
List<MbpsVo.WeightOfInByTime> selWeightOfInByTime(@Param("queryType") Byte queryType,@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);
@ -75,6 +81,8 @@ public interface LogisticsCarRecordDao extends LogisticsCarRecordMapper {
* @param queryType 查询类型
* @param startTime 开始时间
* @param endTime 结束时间
* @param nowDate 现在的时间
* @param countArr 查询的天数
* @return 该时间车辆出货量
*/
List<MbpsVo.WeightOfOutByTime> selWeightOfOutByTime(@Param("queryType") Byte queryType,@Param("startTime") Long startTime,@Param("endTime") Long endTime,@Param("countArr") String[] countArr,@Param("nowDate") String nowDate);

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

@ -43,16 +43,32 @@ public class MbpsService implements IMbpsService {
MbpsVo.AllMbps allMbps = new MbpsVo.AllMbps();
//查询吞进量
Long carOfIn = carRecordDao.selCarOfIn(param.getWarehouseId());
allMbps.setCarOfIn(carOfIn);
if (null == carOfIn){
allMbps.setCarOfIn(0L);
}else{
allMbps.setCarOfIn(carOfIn);
}
//查询吐出量
Long carOfOut = carRecordDao.selCarOfOut(param.getWarehouseId());
allMbps.setCarOfOut(carOfOut);
if (null == carOfOut){
allMbps.setCarOfOut(0L);
}else {
allMbps.setCarOfOut(carOfOut);
}
//查询入库吨数
Long weightOfIn = carRecordDao.selWeightOfIn(param.getWarehouseId());
allMbps.setWeightOfIn(weightOfIn);
if (null == weightOfIn){
allMbps.setWeightOfIn(0L);
}else {
allMbps.setWeightOfIn(weightOfIn);
}
//查询出货吨数
Long weightOfOut = carRecordDao.selWeightOfOut(param.getWarehouseId());
allMbps.setWeightOfOut(weightOfOut);
if (null == weightOfOut){
allMbps.setWeightOfOut(0L);
}else {
allMbps.setWeightOfOut(weightOfOut);
}
return allMbps;
}

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

@ -4,28 +4,28 @@
<select id="selCarOfIn" resultType="java.lang.Long">
SELECT COUNT(cr.id) FROM t_logistics_car_record AS cr WHERE cr.in_out = 0 AND cr.rec_status = 0
<if test="warehouseId!=null and warehouseId!=''">
<if test="warehouseId!=null or warehouseId!=''">
AND cr.warehouse_id = #{warehouseId}
</if>
</select>
<select id="selCarOfOut" resultType="java.lang.Long">
SELECT COUNT(cr.id) FROM t_logistics_car_record AS cr WHERE cr.in_out = 1 AND cr.rec_status = 0
<if test="warehouseId!=null and warehouseId!=''">
<if test="warehouseId!=null or warehouseId!=''">
AND cr.warehouse_id = #{warehouseId}
</if>
</select>
<select id="selWeightOfIn" resultType="java.lang.Long">
SELECT SUM(cr.car_weight) FROM t_logistics_car_record AS cr WHERE cr.in_out = 0 AND cr.rec_status = 0
<if test="warehouseId!=null and warehouseId!=''">
<if test="warehouseId!=null or warehouseId!=''">
AND cr.warehouse_id = #{warehouseId}
</if>
</select>
<select id="selWeightOfOut" resultType="java.lang.Long">
SELECT SUM(cr.car_weight) FROM t_logistics_car_record AS cr WHERE cr.in_out = 1 AND cr.rec_status = 0
<if test="warehouseId!=null and warehouseId!=''">
<if test="warehouseId!=null or warehouseId!=''">
AND cr.warehouse_id = #{warehouseId}
</if>
</select>

Write Preview
Loading…
Cancel
Save