Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
| | |
| | | |
| | | <if test="query.sortType != null"> |
| | | <if test="query.sortType == 1"> |
| | | order by t1.create_time desc, t1.task_urgency_level |
| | | order by t1.task_urgency_level, t1.create_time desc |
| | | <if test="query.sortRule == 2"> |
| | | desc |
| | | desc, t1.create_time desc |
| | | </if> |
| | | </if> |
| | | <if test="query.sortType == 2"> |
| | | order by t1.create_time desc, t2.plate_number |
| | | order by t2.plate_number, t1.create_time desc |
| | | <if test="query.sortRule == 2"> |
| | | desc |
| | | desc, t1.create_time desc |
| | | </if> |
| | | </if> |
| | | <if test="query.sortType == 3"> |
| | |
| | | } |
| | | |
| | | private String buildCityPrefix(Long electronicAreaId) { |
| | | //所有围栏范围之外,测试点位 |
| | | if(0 == electronicAreaId){ |
| | | return "TEST"; |
| | | } |
| | | XpElectronicFenceArea area = xpElectronicFenceAreaService.getById(electronicAreaId); |
| | | if (area == null) { |
| | | throw new ServiceException("运营区域不存在", I18nKeyConstant.POINT_ELECTRONIC_AREA_NOT_EXIST); |
| | |
| | | String fileId = UUID.randomUUID().toString(); |
| | | //上传文件 |
| | | // aliOssService.uploadFile(file.getBytes(), fileId); |
| | | // String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true); |
| | | // String downloadUrl = aliOssService.getDownloadUrl(fil aeId, fileName,true); |
| | | // FileUploadVO fileUploadVO = new FileUploadVO(); |
| | | // fileUploadVO.setId(fileId); |
| | | // fileUploadVO.setName(fileName); |