diff --git a/htmlweb/web/backstage/oa/ocr/picturelog/list.html b/htmlweb/web/backstage/oa/ocr/picturelog/list.html index 347f4d6e..a8dbdf89 100644 --- a/htmlweb/web/backstage/oa/ocr/picturelog/list.html +++ b/htmlweb/web/backstage/oa/ocr/picturelog/list.html @@ -85,7 +85,7 @@ sortname: params.sort, pagesize: params.limit, start: (params.offset / params.limit) + 1, - callStatus: params.callStatus, + callStatus: $("#callStatus").val(), callTimeStart: params.callTimeStart, callTimeEnd: params.callTimeEnd, //search_callStatus:'{"value":"' + $("#search_callStatus").val() + '","op":"equal","type":"string"}', @@ -98,7 +98,15 @@ columns: [ {checkbox: true}, { width:100,valign: "middle",field:'callTime',title:'调用时间',sortable:true}, - { width:150,valign: "middle",field:'pictureUrl',title:'图片地址',sortable:true}, + { width:150,valign: "middle",field:'pictureUrl',title:'图片地址',sortable:true, + formatter: function(value,row,index){ + /*if(undefined != row.pictureUrl && null != row.pictureUrl && "null" != row.pictureUrl ){ + return ''; + }else{ + return row.pictureUrl; + }*/ + return row.pictureUrl + }}, { width:80,valign: "middle",field:'callStatus',title:'调用状态',sortable:true, formatter:function(value,oData,index) { var listOperation = ""; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java index 35e9183d..317dcfd9 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java @@ -94,12 +94,8 @@ public class ImageClassUtil { responseDataVi = HttpClient.doService(serverurl, paramersVi, headerVi, 15000, 30000); JSONObject jsonObjectSimi = JSON.parseObject(responseDataVi); if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0") && jsonObjectSimi.get("data") != null && jsonObjectSimi.getJSONArray("data").size() > 0) { - JSONObject data = jsonObjectSimi.getJSONArray("data").getJSONObject(0); - Map map = new HashMap(); - map.put("classId", data.getString("classId")); - map.put("hash", data.getString("hash")); ocrPictureLog.setCallStatus("1"); - ocrPictureLog.setPictureUrl(imgurl); + ocrPictureLog.setCallMsg(responseDataVi); } else { ocrPictureLog.setCallStatus("2"); ocrPictureLog.setCallMsg(responseDataVi); @@ -107,11 +103,12 @@ public class ImageClassUtil { } catch (Exception e) { logger.error("classify={}", e); ocrPictureLog.setCallStatus("3"); - ocrPictureLog.setCallMsg(e.getMessage()); + ocrPictureLog.setCallMsg(responseDataVi+"Exception:"+e.getMessage()); } finally { ApplicationContext applicationContext = SpringUtil.getApplicationContext(); OcrPictureLogService ocrPictureLogService = applicationContext.getBean(OcrPictureLogService.class); ocrPictureLog.setCallTime(DateUtil.now()); + ocrPictureLog.setPictureUrl(imgurl); ocrPictureLogService.save(ocrPictureLog); } JSONObject jsonObject = JSON.parseObject(responseDataVi);