|
|
@@ -51,7 +51,7 @@ public class TtMerchantPoiController extends BaseController { |
|
|
|
public ResultData list(@ModelAttribute TtMerchantPoi record, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::list"); |
|
|
|
if (null == record || StringUtils.isBlank(record.getTenantId())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode()); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); |
|
|
|
final PageInfo<TtMerchantPoi> page = ttMerchantPoiService.listAsPage(record, pageNum, pageSize); |
|
|
@@ -89,7 +89,7 @@ public class TtMerchantPoiController extends BaseController { |
|
|
|
*/ |
|
|
|
@PostMapping(value = "/upload_material", consumes = "multipart/*", headers = "content-type=multipart/form-data") |
|
|
|
@ApiOperation("上传图片") |
|
|
|
public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq |
|
|
|
public ResultData uploadMaterial(@RequestParam("file") MultipartFile multiReq |
|
|
|
,@RequestParam Map<String, String> param) { |
|
|
|
logger.info("[" + getIpAddr() + "] TtMerchantPoiController::upload_material"); |
|
|
|
String appId = param.get("appId"); |
|
|
@@ -136,5 +136,53 @@ public class TtMerchantPoiController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping(value = "/upload_material1", consumes = "multipart/*", headers = "content-type=multipart/form-data") |
|
|
|
@ApiOperation("上传图片") |
|
|
|
public ResultData uploadMaterial(@RequestParam("file") MultipartFile multiReq) { |
|
|
|
logger.info("[" + getIpAddr() + "] TtMerchantPoiController::upload_material"); |
|
|
|
String appId = "ttef6599d8705b49b101"; |
|
|
|
if(StringUtils.isBlank(appId)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
String materialTypeStr = "7"; |
|
|
|
Integer materialType = null; |
|
|
|
if(StringUtils.isNotBlank(materialTypeStr)){ |
|
|
|
try{ |
|
|
|
materialType = Integer.parseInt(materialTypeStr); |
|
|
|
}catch (Exception e){ } |
|
|
|
} |
|
|
|
if(materialType == null){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
|
|
|
|
EnumMeterialType enumMeterialType = EnumMeterialType.getByCode(materialType); |
|
|
|
if(enumMeterialType == null){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
} |
|
|
|
|
|
|
|
long size = multiReq.getSize(); |
|
|
|
final long length = enumMeterialType.getSize(); |
|
|
|
if (size > length) { |
|
|
|
return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED); |
|
|
|
} |
|
|
|
|
|
|
|
String fileFormat = ""; |
|
|
|
try { |
|
|
|
int dot = multiReq.getOriginalFilename().lastIndexOf('.'); |
|
|
|
if (dot >= 0) { |
|
|
|
fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); |
|
|
|
} |
|
|
|
|
|
|
|
TtOpenMaService openMaService = openService.getTtOpenComponentService().getTtMaServiceByAppid(appId); |
|
|
|
String res = openMaService.mediaUpload(materialType, fileFormat, multiReq.getInputStream()); |
|
|
|
return new ResultData(res); |
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("解析图片",e); |
|
|
|
return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |