Ver código fonte

业务处理单问题处理/发票助手改造

徐昊 8 meses atrás
pai
commit
82736fbf99

+ 36 - 11
src/main/java/fi/rim/fromPlugin/FpzsMainEXPlugin.java

@@ -7,17 +7,7 @@ import com.google.common.collect.Maps;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import kd.bos.cache.CacheFactory;
@@ -460,6 +450,23 @@ public class FpzsMainEXPlugin extends LicenseFormPlugin implements RowClickEvent
         String eventName = e.getEventName();
         //附件信息obj
         String eventArgs = e.getEventArgs();
+        JSONObject filejson = JSON.parseObject(eventArgs);
+        String  Fileurl = filejson.getString("url");
+        String  Filetype = filejson.getString("type");
+        boolean pdf = Filetype.contains("pdf");
+        boolean jpg = Filetype.contains("jpg");
+        boolean jpeg = Filetype.contains("jpeg");
+        boolean png = Filetype.contains("png");
+        String FileType="";
+        if(pdf){
+            FileType="pdf";
+        } else if (jpg){
+            FileType="jpg";
+        }else if (jpeg){
+            FileType="jpeg";
+        }else if (png){
+            FileType="png";
+        }
         if ("pushData".equals(eventName) || "onMessage".equals(eventName)) {
             this.dealWebSoceketMsag(eventArgs);
         }
@@ -736,6 +743,24 @@ public class FpzsMainEXPlugin extends LicenseFormPlugin implements RowClickEvent
                         }
 
                         JSONObject data = FpzsMainService.getInvoiceDataCache(pageId);
+
+                       /*  if(!FileType.isEmpty()){
+                             if("pdf".equals(FileType) || "jpg".equals(FileType) || "png".equals(FileType)){
+                                 String cache = CacheHelper.get("fpzsinvoicecache" + pageId);
+                                 if (StringUtils.isNotEmpty(cache)) {
+                                     data = new JSONObject((Map) JSONObject.parseObject(cache, LinkedHashMap.class));
+                                     JSONObject jsonObject = data.getJSONObject(cache);
+                                     if(jsonObject!=null){
+                                         jsonObject.put("salerName","徐昊测试发票");
+                                         jsonObject.put("taxAmount","8888");
+                                         jsonObject.put("totalAmount","18888");
+                                         jsonObject.put("invoiceNo","123456789");
+                                         data.put(cache,jsonObject);
+                                     }
+                                 }
+                             }
+
+                         }*/
                         FpzsMainService.updateInvoiceGrid(this, data);
                         this.updateInvoiceCard(data);
                         Map<String, String> attIdSerialMap = Maps.newLinkedHashMap();

+ 1 - 1
src/main/java/nckd/fi/all/common/utils/ApiHttpUtils.java → src/main/java/fi/rim/utils/ApiHttpUtils.java

@@ -1,4 +1,4 @@
-package nckd.fi.all.common.utils;
+package fi.rim.utils;
 
 
 import com.alibaba.fastjson.JSON;

+ 1 - 1
src/main/java/nckd/fi/all/common/utils/CodecUtil.java → src/main/java/fi/rim/utils/CodecUtil.java

@@ -1,4 +1,4 @@
-package nckd.fi.all.common.utils;
+package fi.rim.utils;
 
 
 import com.alibaba.fastjson.JSON;

+ 1 - 1
src/main/java/nckd/fi/all/common/utils/FileOutputStreamExample.java → src/main/java/fi/rim/utils/FileOutputStreamExample.java

@@ -1,4 +1,4 @@
-package nckd.fi.all.common.utils;
+package fi.rim.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;

+ 3 - 1
src/main/java/kd/imc/rim/common/helper/RecognitionCheckHelperEx.java

@@ -157,7 +157,9 @@ public class RecognitionCheckHelperEx {
                             exceptionDecr = true;
                             threadCount = CacheHelper.inc("recogThread", countTimeOut);
                             logger.info("识别线程数量{}", threadCount);
-                            recognitionResult = RecognitionFactory.getRecognitionService(HANGXINCHECKSERIVCESTR).recognitionInvoice(recognitionParam);
+
+                            recognitionResult = RecognitionFactory.getRecognitionService(awsRecognitionImpl).recognitionInvoice(recognitionParam);
+
                             threadCount = CacheHelper.decr("recogThread", countTimeOut);
                             exceptionDecr = false;
                         }