diff --git a/logistics/src/main/java/com/ccsens/logistics/api/CarRecordController.java b/logistics/src/main/java/com/ccsens/logistics/api/CarRecordController.java new file mode 100644 index 00000000..c5d30424 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/api/CarRecordController.java @@ -0,0 +1,43 @@ +package com.ccsens.logistics.api; + +import com.ccsens.logistics.bean.dto.CarRecordDto; +import com.ccsens.logistics.bean.dto.MbpsDto; +import com.ccsens.logistics.bean.vo.MbpsVo; +import com.ccsens.logistics.service.ICarRecordService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author 马 + */ + +@Slf4j +@Api(tags = "车辆记录相关接口") +@RestController +@RequestMapping("/carRecord") +public class CarRecordController { + + @Resource + private ICarRecordService iCarRecordService; + + @ApiOperation(value = "添加车辆记录", notes = "mz:添加车辆记录") + @RequestMapping(value = "/addCarRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse addCarRecord(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加车辆记录：{}",params); + iCarRecordService.addCarRecord(params.getParam()); + log.info("添加车辆记录:{}"); + return JsonResponse.newInstance().ok(); + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java b/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java index 0441cd6c..ff331f4c 100644 --- a/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java +++ b/logistics/src/main/java/com/ccsens/logistics/api/MbpsController.java @@ -17,13 +17,12 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * @author 马 */ @Slf4j -@Api(tags = "吞吐量相关接口" , description = "") +@Api(tags = "吞吐量相关接口") @RestController @RequestMapping("/mbps") public class MbpsController { @@ -34,27 +33,27 @@ public class MbpsController { @ApiOperation(value = "查询总吞吐量", notes = "mz:查询总吞吐量") @RequestMapping(value = "/selAllMbps", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse selAllMbps(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看交付物的历史记录：{}",params); + log.info("查询总吞吐量：{}",params); MbpsVo.AllMbps allMbps = iMbpsService.selAllMbps(params.getParam()); - log.info("查看交付物的历史记录:{}",allMbps); + log.info("查询总吞吐量:{}",allMbps); return JsonResponse.newInstance().ok(allMbps); } @ApiOperation(value = "查看吞吐量折线图", notes = "mz:查看吞吐量折线图") @RequestMapping(value = "/selMbpsByTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse selMbpsByTime(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看交付物的历史记录：{}",params); + log.info("查看吞吐量折线图：{}",params); MbpsVo.SelMbpsByTime allMbps = iMbpsService.selMbpsByTime(params.getParam()); - log.info("查看交付物的历史记录:{}",allMbps); + log.info("查看吞吐量折线图:{}",allMbps); return JsonResponse.newInstance().ok(allMbps); } @ApiOperation(value = "查询温度与湿度", notes = "mz:查询温度与湿度") @RequestMapping(value = "/selTeamAndHumidity", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse selTeamAndHumidity(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看交付物的历史记录：{}",params); + log.info("查询温度与湿度：{}",params); MbpsVo.SelTempAndHumidity teamAndHumidity = iMbpsService.selTeamAndHumidity(params.getParam()); - log.info("查看交付物的历史记录:{}",teamAndHumidity); + log.info("查询温度与湿度:{}",teamAndHumidity); return JsonResponse.newInstance().ok(teamAndHumidity); } diff --git a/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java b/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java index a7255fc6..e79b7712 100644 --- a/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java +++ b/logistics/src/main/java/com/ccsens/logistics/api/WarehouseController.java @@ -24,7 +24,7 @@ import java.util.List; * @author 马 */ @Slf4j -@Api(tags = "仓库相关接口" , description = "") +@Api(tags = "仓库相关接口") @RestController @RequestMapping("/warehouse") public class WarehouseController { @@ -35,9 +35,9 @@ public class WarehouseController { @ApiOperation(value = "查询仓库列表及仓库下的摄像头", notes = "mz:查询仓库列表及仓库下的摄像头") @RequestMapping(value = "/selAllWarehouse", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse selAllWarehouse(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看交付物的历史记录：{}",params); + log.info("查询仓库列表及仓库下的摄像头：{}",params); List warehouse = iWarehouseService.selAllWarehouse(params.getParam()); - log.info("查看交付物的历史记录:{}",warehouse); + log.info("查询仓库列表及仓库下的摄像头:{}",warehouse); return JsonResponse.newInstance().ok(warehouse); } diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java new file mode 100644 index 00000000..29c67f28 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java @@ -0,0 +1,28 @@ +package com.ccsens.logistics.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class CarRecordDto { + + @Data + @ApiModel(value = "手动添加车辆记录") + public static class AddCarRecord{ + @ApiModelProperty("记录时间") + private Long recordTime; + @ApiModelProperty("车型(0-小型车,1-中型车,2-大型车)") + private Byte carType; + @ApiModelProperty("进出类型(0-进,1-出)") + private Byte inOut; + @ApiModelProperty("车牌号") + private String licensePlate; + @ApiModelProperty("车辆重量") + private Long carWeight; + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/CarRecordVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/CarRecordVo.java new file mode 100644 index 00000000..18ed796a --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/CarRecordVo.java @@ -0,0 +1,10 @@ +package com.ccsens.logistics.bean.vo; + +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class CarRecordVo { +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/CarRecordService.java b/logistics/src/main/java/com/ccsens/logistics/service/CarRecordService.java new file mode 100644 index 00000000..0052b423 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/CarRecordService.java @@ -0,0 +1,53 @@ +package com.ccsens.logistics.service; + +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.StrUtil; +import com.ccsens.logistics.bean.dto.CarRecordDto; +import com.ccsens.logistics.bean.po.LogisticsCarRecord; +import com.ccsens.logistics.persist.dao.LogisticsCarRecordDao; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +/** + * @author 马 + */ + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class CarRecordService implements ICarRecordService { + + @Resource + private Snowflake snowflake; + @Resource + private LogisticsCarRecordDao carRecordDao; + + @Override + public void addCarRecord(CarRecordDto.AddCarRecord param) { + LogisticsCarRecord carRecord = new LogisticsCarRecord(); + carRecord.setId(snowflake.nextId()); + //车辆类型 + carRecord.setCarType(param.getCarType()); + //记录时间 + carRecord.setRecordTime(param.getRecordTime()); + //进出类型 + carRecord.setInOut(param.getInOut()); + //车牌 + if (StrUtil.isNotBlank(param.getLicensePlate())){ + carRecord.setLicensePlate(param.getLicensePlate()); + }else{ + carRecord.setLicensePlate("未知"); + } + //车辆重量 + if (null != param.getCarWeight()){ + carRecord.setCarWeight(param.getCarWeight()); + } + + carRecordDao.insertSelective(carRecord); + } + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/ICarRecordService.java b/logistics/src/main/java/com/ccsens/logistics/service/ICarRecordService.java new file mode 100644 index 00000000..ef6e4c95 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/ICarRecordService.java @@ -0,0 +1,15 @@ +package com.ccsens.logistics.service; + +import com.ccsens.logistics.bean.dto.CarRecordDto; + +/** + * @author 马 + */ + +public interface ICarRecordService { + /** + * 手动添加车辆记录 + * @param param 车辆类型 记录时间 + */ + void addCarRecord(CarRecordDto.AddCarRecord param); +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java b/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java index 90bb0ae5..f18cfdb1 100644 --- a/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java +++ b/logistics/src/main/java/com/ccsens/logistics/service/WarehouseService.java @@ -24,10 +24,7 @@ public class WarehouseService implements IWarehouseService { @Override public List selAllWarehouse(WarehouseDto.SelWarehouse param) { - //查询仓库及摄像头 - List warehouses = warehouseDao.selWarehouseAndCamera(param.getParkId(),param.getWarehouseId()); - - return warehouses; + return warehouseDao.selWarehouseAndCamera(param.getParkId(),param.getWarehouseId()); } }