From 989910c2cb43e863473fb2a377a7a565cd06949f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 11 十一月 2019 22:51:05 +0800
Subject: [PATCH] 修改业主也需要拍照
---
WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java
index dcca443..7b2d8cb 100644
--- a/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java
@@ -9,8 +9,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.web.core.AbstractComponentSMO;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.file.IGetFileSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
@@ -34,7 +33,7 @@
private RestTemplate restTemplate;
@Override
- public ResponseEntity<Object> getFile(IPageData pd) throws SMOException,IOException {
+ public ResponseEntity<Object> getFile(IPageData pd) throws SMOException, IOException {
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.hasKeyAndValue(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯ID");
@@ -47,7 +46,7 @@
Map paramMap = BeanConvertUtil.beanCovertMap(result);
paramIn.putAll(paramMap);
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/file.getFile"+mapToUrlParam(paramIn);
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/file.getFile" + mapToUrlParam(paramIn);
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
@@ -56,7 +55,7 @@
//澶勭悊鏂囦欢涓嬭浇鍔熻兘
if (responseEntity.getStatusCode() != HttpStatus.OK) {
- return new ResponseEntity<Object>(responseEntity.getBody(),responseEntity.getStatusCode());
+ return new ResponseEntity<Object>(responseEntity.getBody(), responseEntity.getStatusCode());
}
JSONObject outParam = JSONObject.parseObject(responseEntity.getBody());
@@ -69,9 +68,9 @@
//headers.add("Content-Disposition", "attachment; filename=" + outParam.getString("fileName"));
headers.add("Accept-Ranges", "bytes");
- byte[] context = Base64Convert.base64ToByte(outParam.getString("context"));
+ byte[] context = Base64Convert.base64ToByte(outParam.getString("context").replace("data:image/webp;base64,", ""));
- return new ResponseEntity<Object>(context,headers,HttpStatus.OK);
+ return new ResponseEntity<Object>(context, headers, HttpStatus.OK);
}
public RestTemplate getRestTemplate() {
--
Gitblit v1.8.0