From 66e3b72fc645231cd9f3779d97a0b819148ace31 Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 3 Aug 2023 17:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=94=E8=AF=81=E6=98=8E?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActWithoutProofController.java | 4 +++- .../epmet/service/ActWithoutProofService.java | 2 +- .../impl/ActWithoutProofServiceImpl.java | 23 +++++++++++++------ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ActWithoutProofController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ActWithoutProofController.java index 4e6b06283b..1c19845728 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ActWithoutProofController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ActWithoutProofController.java @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.result.WzmDocumentRsultDTO; import com.epmet.service.ActWithoutProofService; import com.epmet.util.ActWithoutProofUtils; import org.apache.commons.lang3.StringUtils; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.io.IOException; +import java.util.List; import java.util.Map; /** @@ -50,7 +52,7 @@ public class ActWithoutProofController { * @throws IOException */ @GetMapping("getWzmProject") - public Result getWzmProject(@RequestParam Map params) throws IOException { + public Result> getWzmProject(@RequestParam Map params) throws IOException { String idCard = "", certType = "", qrcode = "", xm = "", zmtaskguid = ""; String token = ActWithoutProofUtils.getToken(); if (StringUtils.isEmpty(token)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ActWithoutProofService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ActWithoutProofService.java index bb14db9b76..de5fe7295d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ActWithoutProofService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ActWithoutProofService.java @@ -34,7 +34,7 @@ public interface ActWithoutProofService { * @param xm 残疾人证和不动产权属状况证明必填 * @param zmtaskguid 证明guid */ - WzmDocumentRsultDTO getWzmProject(String token, String idCard, String certType, String qrcode, String xm, String zmtaskguid) throws IOException; + List getWzmProject(String token, String idCard, String certType, String qrcode, String xm, String zmtaskguid) throws IOException; /** * 重新开具证明 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/ActWithoutProofServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/ActWithoutProofServiceImpl.java index ad2d3364ad..02e4b2ca09 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/ActWithoutProofServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/ActWithoutProofServiceImpl.java @@ -102,7 +102,7 @@ public class ActWithoutProofServiceImpl implements ActWithoutProofService { } @Override - public WzmDocumentRsultDTO getWzmProject(String token, String idCard, String certType, String qrcode, String xm, String zmtaskguid) throws IOException { + public List getWzmProject(String token, String idCard, String certType, String qrcode, String xm, String zmtaskguid) throws IOException { CloseableHttpClient client = null; CloseableHttpResponse response = null; try { @@ -144,22 +144,31 @@ public class ActWithoutProofServiceImpl implements ActWithoutProofService { //返回 JSONObject result = JSONObject.parseObject(EntityUtils.toString(response.getEntity())); WzmDocumentRsultDTO dto = null; + List dtoList= new ArrayList<>(); if (result.getString("code").equals("200")) { - JSONArray jsonArray = JSONObject.parseObject(result.getJSONObject("data").getString("custom")).getJSONArray("result"); + JSONArray jsonArray = JSONObject.parseObject(result.getJSONObject("data").getString("custom")).getJSONArray("resultlist"); if (null != jsonArray && jsonArray.size() > 0) { JSONObject j = JSONObject.parseObject(jsonArray.get(0).toString()); dto = new WzmDocumentRsultDTO(); dto.setZmresultname(j.getString("zmresultname")); - dto.setDownloadurl(j.getString("downloadurl")); + if(StringUtils.isNotEmpty(j.getString("downloadurl"))){ + String url = j.getString("downloadurl"); + if (url.startsWith("http://172.20.84.138/")) { + url = url.replaceAll("http://172.20.84.138/", "https://rzzhsq.shuzirizhao.cn/"); + } + dto.setDownloadurl(url); + } dto.setTimeqrcode(j.getString("timeqrcode")); - dto.setBase64str(j.getString("base64str")); + if(StringUtils.isNotEmpty(j.getString("base64str"))){ + dto.setBase64str("data:image/jpeg;base64," + j.getString("base64str")); + } + dtoList.add(dto); } - log.info(result.toString()); - return dto; + return dtoList; } else { String erro = JSONObject.parseObject(result.getJSONObject("data").getString("custom")).getString("text"); log.error(erro, result.toString()); - return new WzmDocumentRsultDTO(); + throw new EpmetException(erro); } } catch (Exception e) { throw new EpmetException("获取失败，请联系管理员！");