|
|
|
@ -6,6 +6,7 @@ import cc.yunxi.common.exception.BizIllegalException;
|
|
|
|
|
import cc.yunxi.domain.dto.UserDTO;
|
|
|
|
|
import cc.yunxi.domain.po.*;
|
|
|
|
|
import cc.yunxi.domain.vo.device.*;
|
|
|
|
|
import cc.yunxi.domain.vo.file.FileUploadReqVO;
|
|
|
|
|
import cc.yunxi.domain.vo.file.FileUploadRespVO;
|
|
|
|
|
import cc.yunxi.service.*;
|
|
|
|
|
import cc.yunxi.utils.CustomerMqttClient;
|
|
|
|
@ -17,10 +18,7 @@ import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
@ -298,7 +296,7 @@ public class DeviceController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@PostMapping("/login")
|
|
|
|
|
@ApiOperation("清运员手机号登录")
|
|
|
|
|
@ApiOperation("用户手机号登录")
|
|
|
|
|
public CommonResult<LoginRespVO> login(@RequestBody LoginReqVO loginReqVO) {
|
|
|
|
|
RecycleDevice device = deviceService.getByDeviceCode(loginReqVO.getDeviceCode());
|
|
|
|
|
if (device == null) {
|
|
|
|
@ -523,6 +521,28 @@ public class DeviceController {
|
|
|
|
|
return CommonResult.success("指令下发成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("上传抓拍图片")
|
|
|
|
|
@PostMapping("/uploadImage")
|
|
|
|
|
public CommonResult<String> uploadSnap(@RequestBody SnapVO snapVO) {
|
|
|
|
|
String orderNo = snapVO.getOrderNo();
|
|
|
|
|
String deviceCode = snapVO.getDeviceCode();
|
|
|
|
|
// 先上传
|
|
|
|
|
List<Snap> list = snapVO.getSnapList();
|
|
|
|
|
if (list == null || list.size() == 0) return CommonResult.error(400, "上传失败,图片为空!");
|
|
|
|
|
ArrayList<FileUploadRespVO> result = new ArrayList<>();
|
|
|
|
|
list.forEach(snap -> {
|
|
|
|
|
FileUploadRespVO respVO = fileService.uploadImage(snap.getImage(), snap.getFileName());
|
|
|
|
|
result.add(respVO);
|
|
|
|
|
});
|
|
|
|
|
if (StrUtil.isNotEmpty(orderNo)) {
|
|
|
|
|
redisTool.setValue(orderNo, result, 10 * 60 * 1000L);//业务抓拍
|
|
|
|
|
} else {
|
|
|
|
|
redisTool.setValue("snap_" + deviceCode, result, 3 * 60 * 1000L);//临时抓拍
|
|
|
|
|
}
|
|
|
|
|
return CommonResult.success("上传成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation("获取设备状态")
|
|
|
|
|
@PostMapping("/getStatus")
|
|
|
|
|
public CommonResult<String> getStatus(@RequestBody DeviceVO deviceVO) {
|
|
|
|
|