From be6f977824cb205725f40e7c04b12ec66bd9e707 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 14 Nov 2023 18:30:28 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/mq/SendBussMQService.java | 10 ++++++++--
 .../com/adc/da/mq/SendStandMQService.java     | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
index ccf787c4..f8f7b47a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
@@ -140,12 +140,18 @@ public class SendBussMQService {
                     saveMap.put("put_time_data","0" + putTimeStr);
                 }
             } catch (ParseException e) {
-                saveMap.put("put_time_data",-1000000000000000000L);
+                saveMap.put("put_time_data",-1000000000L);
             }
         }else{
-            saveMap.put("put_time_data",-1000000000000000000L);
+            saveMap.put("put_time_data",-1000000000L);
         }
         saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime()));    // 入库时间
+        if (infoEO.getCreationTime().getTime() > 12) {
+            saveMap.put("warehousingTimeStamp",infoEO.getCreationTime().getTime()); // 入库时间戳
+        }else {
+            saveMap.put("warehousingTimeStamp", "0" + infoEO.getCreationTime().getTime()); // 入库时间戳
+        }
+
 
         //查询字典表,形成Hash映射提升速度
         List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_id","dic_type_code", "dic_type_name","show_index");
diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
index f0e8b79f..dda3b84e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
@@ -210,6 +210,11 @@ public class SendStandMQService {
         saveMap.put("CHJL",infoEO.getCHJL());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime()));    // 入库时间
+        if (infoEO.getCreationTime().getTime() > 12) {
+            saveMap.put("warehousingTimeStamp",infoEO.getCreationTime().getTime()); // 入库时间戳
+        }else {
+            saveMap.put("warehousingTimeStamp", "0" + infoEO.getCreationTime().getTime()); // 入库时间戳
+        }
 
         String fieldInfo = InitStandAttrUtil.queryField;
         List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
@@ -231,6 +236,20 @@ public class SendStandMQService {
                     if(fieldValue.contains("null")){
                         fieldValue = fieldValue.replace("null","");
                     }
+                    if ("SSRQ".equals(field)) {
+                        if (infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())) {
+                            try {
+                                Date parse = sdf.parse(infoMap.get(field).toString());
+                                fieldValue = String.valueOf(parse.getTime());
+                                // ES中的排序问题，时间戳需要补0
+                                if (fieldValue.length() <= 12) {
+                                    fieldValue = "0" + fieldValue;
+                                }
+                            } catch (ParseException e) {
+                                fieldValue = "";
+                            }
+                        }
+                    }
                 }
                 saveMap.put(field+"Name",fieldValue);
             }catch (Exception e){