提交修改

This commit is contained in:
quyixiao 2025-03-18 22:39:58 +08:00
parent e98ed81598
commit 3162cbb38f
7 changed files with 150 additions and 51 deletions

View File

@ -10,7 +10,7 @@ import com.heyu.api.data.annotation.CacheResult;
import com.heyu.api.data.annotation.NotIntercept;
import com.heyu.api.data.utils.ApiR;
import com.heyu.api.data.utils.R;
import com.heyu.api.request.imageenhan.ImageDecodeBlindPicWatermarkReq;
import com.heyu.api.request.imageenhan.ImageBlindPicWatermarkReq;
import com.heyu.api.resp.imageenhan.ImageDecodeBlindPicWatermarkResp;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -37,7 +37,7 @@ public class AssessCompositionController extends BaseController {
@RequestMapping("/composition")
@CacheResult
public R composition(ImageDecodeBlindPicWatermarkReq req) {
public R composition(ImageBlindPicWatermarkReq req) {
ImageDecodeBlindPicWatermarkResp resp = new ImageDecodeBlindPicWatermarkResp();
AAssessCompositionRequest request = new AAssessCompositionRequest();

View File

@ -21,6 +21,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/***
* https://next.api.aliyun.com/api/imageenhan/2019-09-30/ImageBlindCharacterWatermark
*
* 图像隐形文字水印
*
* ImageBlindCharacterWatermark
*
*
*/
@Slf4j
@RestController
@RequestMapping("/image")

View File

@ -0,0 +1,76 @@
package com.heyu.api.controller.imageenhan;
import com.aliyun.imageenhan20190930.models.ImageBlindPicWatermarkResponse;
import com.aliyun.imageenhan20190930.models.ImageBlindPicWatermarkResponseBody;
import com.heyu.api.alibaba.handle.imageenhan.AImageDecodeBlindPicWatermarkHandle;
import com.heyu.api.alibaba.handle.imageenhan.AImageEncodeBlindPicWatermarkHandle;
import com.heyu.api.alibaba.request.imageenhan.AImageDecodeBlindPicWatermarkRequest;
import com.heyu.api.alibaba.request.imageenhan.AImageEncodeBlindPicWatermarkRequest;
import com.heyu.api.controller.BaseController;
import com.heyu.api.data.annotation.CacheResult;
import com.heyu.api.data.annotation.NotIntercept;
import com.heyu.api.data.utils.ApiR;
import com.heyu.api.data.utils.R;
import com.heyu.api.request.imageenhan.ImageBlindPicWatermarkReq;
import com.heyu.api.resp.imageenhan.ImageBlindPicWatermarkResp;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/***
* https://next.api.aliyun.com/api/imageenhan/2019-09-30/ImageBlindPicWatermark
*
* 图像隐形图片水印
*
* ImageBlindPicWatermark
*
*/
@Slf4j
@RestController
@RequestMapping("/image")
@NotIntercept
public class ImageBlindPicWatermarkController extends BaseController {
@Autowired
private AImageEncodeBlindPicWatermarkHandle aImageEncodeBlindPicWatermarkHandle;
@Autowired
private AImageDecodeBlindPicWatermarkHandle aImageDecodeBlindPicWatermarkHandle;
@RequestMapping("/picWatermark")
@CacheResult
public R scan(ImageBlindPicWatermarkReq req) {
ImageBlindPicWatermarkResp resp = new ImageBlindPicWatermarkResp();
if ("encode".equals(req.getType())) {
AImageEncodeBlindPicWatermarkRequest aImageEncodeBlindPicWatermarkRequest = new AImageEncodeBlindPicWatermarkRequest();
aImageEncodeBlindPicWatermarkRequest.setImageUrl(req.getImageUrl());
aImageEncodeBlindPicWatermarkRequest.setImageBase64(req.getImageBase64());
aImageEncodeBlindPicWatermarkRequest.setWatermarkUrl(req.getEncodeImageUrl());
aImageEncodeBlindPicWatermarkRequest.setWatermarkBase64(req.getEncodeImageBase64());
aImageEncodeBlindPicWatermarkRequest.setQualityFactor(req.getQualityFactor());
ApiR<ImageBlindPicWatermarkResponse> aR = aImageEncodeBlindPicWatermarkHandle.handle(aImageEncodeBlindPicWatermarkRequest);
if (aR.isSuccess() && isSuccessStatusCode(aR.getData().getStatusCode())) {
ImageBlindPicWatermarkResponseBody.ImageBlindPicWatermarkResponseBodyData responseBodyData = aR.getData().getBody().getData();
resp.setImageURL(responseBodyData.getWatermarkImageURL());
return R.ok().setData(responseBodyData);
}
return R.error(aR.getErrorMsg());
} else if ("decode".equals(req.getType())) {
AImageDecodeBlindPicWatermarkRequest aImageDecodeBlindPicWatermarkRequest = new AImageDecodeBlindPicWatermarkRequest();
aImageDecodeBlindPicWatermarkRequest.setImageUrl(req.getImageUrl());
aImageDecodeBlindPicWatermarkRequest.setImageBase64(req.getImageBase64());
ApiR<ImageBlindPicWatermarkResponse> aR = aImageDecodeBlindPicWatermarkHandle.handle(aImageDecodeBlindPicWatermarkRequest);
if(aR.isSuccess() && isSuccessStatusCode(aR.getData().getStatusCode())) {
ImageBlindPicWatermarkResponseBody.ImageBlindPicWatermarkResponseBodyData responseBodyData = aR.getData().getBody().getData();
resp.setImageURL(responseBodyData.getLogoURL());
return R.ok().setData(responseBodyData);
}
return R.error(aR.getErrorMsg());
}
return R.error();
}
}

View File

@ -1,36 +0,0 @@
package com.heyu.api.controller.imageenhan;
import com.heyu.api.alibaba.handle.imageenhan.AImageDecodeBlindPicWatermarkHandle;
import com.heyu.api.alibaba.request.imageenhan.AImageDecodeBlindPicWatermarkRequest;
import com.heyu.api.data.annotation.CacheResult;
import com.heyu.api.data.annotation.NotIntercept;
import com.heyu.api.data.utils.R;
import com.heyu.api.request.imageenhan.ImageDecodeBlindPicWatermarkReq;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("/image")
@NotIntercept
public class ImageDecodeBlindPicWatermarkController {
@Autowired
private AImageDecodeBlindPicWatermarkHandle aImageDecodeBlindPicWatermarkHandle;
@RequestMapping("/decodePicWatermark")
@CacheResult
public R scan(ImageDecodeBlindPicWatermarkReq req) {
AImageDecodeBlindPicWatermarkRequest aImageDecodeBlindPicWatermarkRequest = new AImageDecodeBlindPicWatermarkRequest();
aImageDecodeBlindPicWatermarkHandle.handle(aImageDecodeBlindPicWatermarkRequest);
return R.error();
}
}

View File

@ -0,0 +1,53 @@
package com.heyu.api.request.imageenhan;
import com.heyu.api.request.CommonReq;
import lombok.Data;
@Data
public class ImageBlindPicWatermarkReq extends CommonReq {
/**
* 指定调用功能包括
*
* encode 加水印
*
* decode 解水印
*
*/
private String type = "encode";
/**
* 图片的url
*/
private String encodeImageUrl;
/**
* base 64 编码
*/
private String encodeImageBase64;
/**
* 输出图格式可以选择jpegpngjpgbmp四种格式默认png
* <p>
* 说明
* FunctionType 为encode_picencode_pic_plus或encode_pic_bold时该参数必填
* FunctionType 为decode_picdecode_pic_plus或decode_pic_bold时该参数不填
* 示例值:
* jpg
*/
private String outputFileType = "jpg";
/**
* 输出图像的质量大小图像越大质量越高取值范围 1~100默认 100
* <p>
* 说明 仅当 OutputFileType 为jpg时有效
* 示例值:
* 100
*/
private Integer qualityFactor = 50;
}

View File

@ -1,13 +0,0 @@
package com.heyu.api.request.imageenhan;
import com.heyu.api.request.CommonReq;
import lombok.Data;
@Data
public class ImageDecodeBlindPicWatermarkReq extends CommonReq {
}

View File

@ -0,0 +1,10 @@
package com.heyu.api.resp.imageenhan;
import com.heyu.api.resp.CommonImageUrlResp;
import lombok.Data;
@Data
public class ImageBlindPicWatermarkResp extends CommonImageUrlResp {
}