From d3e82bb53d28c377bee7469e687fd90953721c19 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 29 Nov 2024 09:32:48 +0800 Subject: [PATCH 1/2] getocrcode --- .../bonus/common/biz/utils/HttpHelper.java | 24 ++++++++++++ .../repair/controller/RepairController.java | 37 ++++++++++++++++++- .../material/repair/domain/vo/OCRBean.java | 28 ++++++++++++++ 3 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/OCRBean.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java index 48524e27..6d80a9fa 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/utils/HttpHelper.java @@ -156,4 +156,28 @@ public class HttpHelper { // } + /** + * 不带鉴权的请求 + * @param url + * @param JSONBody + * @return + * @throws Exception + */ + public static String sendHttpPostForToken(String url, String JSONBody) throws Exception { + System.err.println("JSONBody-=========:" + JSONBody); + CloseableHttpClient httpClient = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost(url); + httpPost.addHeader("Content-Type", "application/json"); + httpPost.setEntity(new StringEntity(JSONBody)); + CloseableHttpResponse response = httpClient.execute(httpPost); +// System.out.println(response.getStatusLine().getStatusCode() + "\n"); + HttpEntity entity = response.getEntity(); + String responseContent = EntityUtils.toString(entity, "UTF-8"); +// System.out.println(responseContent); + response.close(); + httpClient.close(); + return responseContent; + } + + } \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index c213ec4a..49ed57e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -1,5 +1,6 @@ package com.bonus.material.repair.controller; +import com.bonus.common.biz.utils.HttpHelper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -7,6 +8,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.repair.domain.*; +import com.bonus.material.repair.domain.vo.OCRBean; import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.domain.vo.RepairInputDetailsVo; @@ -19,7 +21,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; - +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotBlank; @@ -200,4 +203,36 @@ public class RepairController extends BaseController { List list = service.getRepairedDetailList(dto); return getDataTable(list); } + + @ApiOperation(value = "获取Ocr code") + @RequestMapping(value = "getOcrCode", method = RequestMethod.POST) + @ResponseBody + public JSONObject getOcrCode(OCRBean o) { + String url = "http://10.138.55.102:10000/api_gqj/pre"; + JSONObject js = null; + try { + String jsonStr = JSONObject.toJSONString(o); + String data = "{\"code\": \"fack_code\"}"; //HttpHelper.sendHttpPostForToken(url, jsonStr); + js = JSONObject.parseObject(data); + } catch (Exception e) { + e.printStackTrace(); + } + return js; + } + +// public static void main(String[] args) { +// String url = "http://10.138.55.102:10000/api_gqj/pre"; +// JSONObject js = null; +// try { +// OCRBean o = new OCRBean(); +// String jsonStr = JSONObject.toJSONString(o); +// String data = "{\"code\": \"fack_code\"}"; //HttpHelper.sendHttpPostForToken(url, jsonStr); +// js = JSONObject.parseObject(data); +// System.out.println(js); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } + + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/OCRBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/OCRBean.java new file mode 100644 index 00000000..65272ca1 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/OCRBean.java @@ -0,0 +1,28 @@ +package com.bonus.material.repair.domain.vo; + +public class OCRBean { + + private String image; + private String jiju_type; + private String auth_lic; + public String getImage() { + return image; + } + public void setImage(String image) { + this.image = image; + } + public String getJiju_type() { + return jiju_type; + } + public void setJiju_type(String jiju_type) { + this.jiju_type = jiju_type; + } + public String getAuth_lic() { + return auth_lic; + } + public void setAuth_lic(String auth_lic) { + this.auth_lic = auth_lic; + } + + +} From 1f13fd537bd0f80ab60655c06c4c2af3f27d5166 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 29 Nov 2024 09:41:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/repair/service/impl/RepairServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 7b1b206c..142d7279 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -80,7 +80,7 @@ public class RepairServiceImpl implements RepairService { Map> map = repairDeviceList.stream().collect(Collectors.groupingBy(RepairDeviceVO::getTypeId)); for (Long key : map.keySet()) { List tempList = map.get(key); - List toRepairList = tempList.stream().filter(o -> !"1".equals(o.getStatus())).collect(Collectors.toList()); + //List toRepairList = tempList.stream().filter(o -> !"1".equals(o.getStatus())).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(tempList)) { RepairDeviceSummaryVo vo = new RepairDeviceSummaryVo(); Long[] ids = tempList.stream().map(RepairDeviceVO::getId).toArray(Long[]::new); @@ -88,7 +88,7 @@ public class RepairServiceImpl implements RepairService { int repairedNumSum = tempList.stream().mapToInt(RepairDeviceVO::getRepairedNum).sum(); int scrapNumSum = tempList.stream().mapToInt(RepairDeviceVO::getScrapNum).sum(); //BigDecimal typeCostSum = tempList.stream().map(RepairDeviceVO::getTotalCost).reduce(BigDecimal.ZERO, BigDecimal::add); - vo.setRepairDeviceList(toRepairList); + vo.setRepairDeviceList(tempList); vo.setIds(ids); vo.setTypeRepairNum(repairNumSum); vo.setTypeRepairedNum(repairedNumSum);