|
|
|
@ -21,10 +21,7 @@ import cc.yunxi.domain.vo.device.RecycleDeviceRespVO;
|
|
|
|
|
import cc.yunxi.domain.vo.file.FileUploadReqVO;
|
|
|
|
|
import cc.yunxi.domain.vo.file.FileUploadRespVO;
|
|
|
|
|
import cc.yunxi.enums.UserTypeEnum;
|
|
|
|
|
import cc.yunxi.service.IClientService;
|
|
|
|
|
import cc.yunxi.service.IFileService;
|
|
|
|
|
import cc.yunxi.service.IRecycleDevicePhotoService;
|
|
|
|
|
import cc.yunxi.service.IRecycleDeviceService;
|
|
|
|
|
import cc.yunxi.service.*;
|
|
|
|
|
import cc.yunxi.service.impl.CommonService;
|
|
|
|
|
import cc.yunxi.utils.RestTemplateUtils;
|
|
|
|
|
import cc.yunxi.utils.UserContext;
|
|
|
|
@ -78,6 +75,9 @@ public class EntranceController {
|
|
|
|
|
@Resource
|
|
|
|
|
private IRecycleDevicePhotoService recycleDevicePhotoService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private IRecycleDeviceRunningDataService recycleDeviceRunningDataService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("回收柜二维码请求设备信息接口")
|
|
|
|
|
@RequestMapping("/dev_qr_code/wx9e638ba024ed7868")
|
|
|
|
@ -146,18 +146,47 @@ public class EntranceController {
|
|
|
|
|
|
|
|
|
|
@ApiOperation("投递照片上传")
|
|
|
|
|
@PostMapping(value ="/device/file/delivery_photo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
|
|
|
|
public CommonResult<FileUploadRespVO> ZSG_DeliveryPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
|
|
|
|
|
public CommonResult<String> ZSG_DeliveryPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
|
|
|
|
|
FileUploadRespVO uploadRespVO = fileService.uploadImage(uploadReqVO);
|
|
|
|
|
|
|
|
|
|
recycleDevicePhotoService.addRecycleDevicePhoto(orderid,uploadRespVO.getUrl());
|
|
|
|
|
return CommonResult.success(uploadRespVO);
|
|
|
|
|
return CommonResult.success("请求成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation("清运照片上传")
|
|
|
|
|
@PostMapping(value ="/device/file/clean_photo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
|
|
|
|
public CommonResult<FileUploadRespVO> ZSG_CleanPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
|
|
|
|
|
public CommonResult<String> ZSG_CleanPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
|
|
|
|
|
FileUploadRespVO uploadRespVO = fileService.uploadImage(uploadReqVO);
|
|
|
|
|
recycleDevicePhotoService.addRecycleDevicePhoto(orderid,uploadRespVO.getUrl());
|
|
|
|
|
return CommonResult.success(uploadRespVO);
|
|
|
|
|
return CommonResult.success("请求成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation("上传投递重量")
|
|
|
|
|
@PostMapping(value ="/delivery_data")
|
|
|
|
|
public CommonResult<String> ZSG_DeliveryData(HttpServletRequest request) throws Exception {
|
|
|
|
|
|
|
|
|
|
// 1. 参数解析处理
|
|
|
|
|
Map<String, String> dataMap = WebUtils.parseQueryString(request);
|
|
|
|
|
|
|
|
|
|
RecycleDeviceRespVO recycleDeviceRespVO = BeanUtils.copyBean(dataMap, RecycleDeviceRespVO.class);
|
|
|
|
|
|
|
|
|
|
// 2. 保存数据
|
|
|
|
|
recycleDeviceRunningDataService.addRecycleDeviceRunningData(recycleDeviceRespVO,1);
|
|
|
|
|
|
|
|
|
|
return CommonResult.success("上传成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation("上传清运重量")
|
|
|
|
|
@PostMapping(value ="/clean_data")
|
|
|
|
|
public CommonResult<String> ZSG_CleanData(HttpServletRequest request) throws Exception {
|
|
|
|
|
// 1. 参数解析处理
|
|
|
|
|
Map<String, String> dataMap = WebUtils.parseQueryString(request);
|
|
|
|
|
|
|
|
|
|
RecycleDeviceRespVO recycleDeviceRespVO = BeanUtils.copyBean(dataMap, RecycleDeviceRespVO.class);
|
|
|
|
|
|
|
|
|
|
// 2. 保存数据
|
|
|
|
|
recycleDeviceRunningDataService.addRecycleDeviceRunningData(recycleDeviceRespVO,2);
|
|
|
|
|
|
|
|
|
|
return CommonResult.success("上传成功");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|