标签上日期格式修改

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -402,21 +402,21 @@ public class Barcode extends BasePo implements Serializable {
 
 
     public String getExpireDateStr() {
     public String getExpireDateStr() {
         if (expireDate != null) {
         if (expireDate != null) {
-            return DateUtil.toDateString(expireDate);
+            return DateUtil.toDateString(expireDate,"MM-dd-yyyy HH:mm:ss");
         }
         }
         return "";
         return "";
     }
     }
 
 
     public String getOpenTimeStr() {
     public String getOpenTimeStr() {
         if (openTime != null) {
         if (openTime != null) {
-            return DateUtil.toDateString(openTime);
+            return DateUtil.toDateString(openTime,"MM-dd-yyyy HH:mm");
         }
         }
         return "";
         return "";
     }
     }
 
 
     public String getStabilizationEndDateStr() {
     public String getStabilizationEndDateStr() {
         if (stabilizationEndDate != null) {
         if (stabilizationEndDate != null) {
-            return DateUtil.toDateString(stabilizationEndDate);
+            return DateUtil.toDateString(stabilizationEndDate,"MM-dd-yyyy HH:mm:ss");
         }
         }
         return "";
         return "";
     }
     }

src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Api.java

@@ -219,11 +219,6 @@ public class Micron20031Api {
     final static String userName = "O4xtTDhZoA8IH3LWyI69JnbQMxmjhmTeBKNMIcYQhdnX9m8t";
     final static String userName = "O4xtTDhZoA8IH3LWyI69JnbQMxmjhmTeBKNMIcYQhdnX9m8t";
     final static String password = "FCIdcIukdghfb71CqdH7q9NVuqcqADRky3efd0C2amsm52zjlkqgfBCFzxswqDkZ";
     final static String password = "FCIdcIukdghfb71CqdH7q9NVuqcqADRky3efd0C2amsm52zjlkqgfBCFzxswqDkZ";
 
 
-    public static void main(String[] args) {
-        String auth = userName + ":" + password;
-        String encode = Base64.getEncoder().encodeToString(auth.getBytes());
-        System.out.println(encode);
-    }
 
 
     public static String getAuthToken() {
     public static String getAuthToken() {
         if (ObjectUtil.isEmpty(url_getToken)) {
         if (ObjectUtil.isEmpty(url_getToken)) {
@@ -487,15 +482,15 @@ public class Micron20031Api {
         }
         }
         Object stabilizationEndDateObj = resultMap.get("stabilizationEndDate");
         Object stabilizationEndDateObj = resultMap.get("stabilizationEndDate");
         if (stabilizationEndDateObj != null){
         if (stabilizationEndDateObj != null){
-            Date stabilizationEndDate = DateUtil.toDate(stabilizationEndDateObj.toString(), "MM-dd-yyyy");
+            Date stabilizationEndDate = DateUtil.toDate(stabilizationEndDateObj.toString(), "MM-dd-yyyy HH:mm:ss");
             barcode.setStabilizationEndDate(stabilizationEndDate);
             barcode.setStabilizationEndDate(stabilizationEndDate);
             barcode.updateAppendData("stabilizationEndDate", stabilizationEndDate);
             barcode.updateAppendData("stabilizationEndDate", stabilizationEndDate);
         }
         }
         barcode.updateAppendData("opUsername", username);
         barcode.updateAppendData("opUsername", username);
         barcode.updateAppendData("maTrackOut", false);
         barcode.updateAppendData("maTrackOut", false);
         try {
         try {
-            Object exposureStartDateObj = resultMap.get("exposureStartDate");
-            Date exposureStartDate = DateUtil.toDate(exposureStartDateObj.toString(), "MM-dd-yyyy");
+            Object exposureStartDateObj = resultMap.get("exposureStartDateTime");
+            Date exposureStartDate = DateUtil.toDate(exposureStartDateObj.toString(), "MM-dd-yyyy HH:mm");
             barcode.setOpenTime(exposureStartDate);
             barcode.setOpenTime(exposureStartDate);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();