时间格式化

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrument.java

@@ -2,6 +2,7 @@ package com.flossom.common.core.domain.entity;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.temporal.ChronoField;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.utils.DateUtils;
@@ -363,7 +364,7 @@ public class WxInstrument extends BaseEntity {
         this.nursingTime = nursingTime;
         // 将 localTime 转为 分秒 格式
         if (nursingTime != null) {
-            this.nursingTimeStr = DateUtils.formatMS(nursingTime.getSecond());
+            this.nursingTimeStr = DateUtils.formatMS(nursingTime.getLong(ChronoField.SECOND_OF_DAY));
         }
     }
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeServiceInfo.java

@@ -30,11 +30,21 @@ public class WxModeServiceInfo extends BaseEntity
     @Excel(name = "服务开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date serviceStartTime;
 
+    /**
+     * 服务开始时间 格式化
+     */
+    private String serviceStartTimeStr;
+
     /** 服务结束时间 */
     @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "服务结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date serviceEndTime;
 
+    /**
+     * 服务结束时间 格式化
+     */
+    private String serviceEndTimeStr;
+
     /** 启动图片资源 */
     @Excel(name = "启动图片资源")
     private String startSource;
@@ -109,6 +119,22 @@ public class WxModeServiceInfo extends BaseEntity
         this.modeId = modeId;
     }
 
+    public String getServiceStartTimeStr() {
+        return serviceStartTimeStr;
+    }
+
+    public void setServiceStartTimeStr(String serviceStartTimeStr) {
+        this.serviceStartTimeStr = serviceStartTimeStr;
+    }
+
+    public String getServiceEndTimeStr() {
+        return serviceEndTimeStr;
+    }
+
+    public void setServiceEndTimeStr(String serviceEndTimeStr) {
+        this.serviceEndTimeStr = serviceEndTimeStr;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java

@@ -26,7 +26,9 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.temporal.ChronoField;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -459,11 +461,37 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             // 查询 服务集合
             WxModeServiceInfo wxModeServiceInfo = new WxModeServiceInfo();
             wxModeServiceInfo.setModeId(wxMode.getId());
-            wxModeRet.setServiceData(wxModeServiceInfoMapper.selectWxModeServiceInfoList(wxModeServiceInfo));
+            List<WxModeServiceInfo> wxModeServiceInfoList = wxModeServiceInfoMapper.selectWxModeServiceInfoList(wxModeServiceInfo);
+            if (wxModeServiceInfoList != null && wxModeServiceInfoList.size() > 0) {
+                Calendar calendar = Calendar.getInstance();
+                for (WxModeServiceInfo modeServiceInfo : wxModeServiceInfoList) {
+                    if (modeServiceInfo.getServiceStartTime() != null) {
+                        Date date = wxModeServiceInfo.getServiceStartTime();
+                        calendar.setTime(date);
+                        modeServiceInfo.setServiceStartTimeStr(
+                                DateUtils.formatMS(calendar.get(Calendar.HOUR_OF_DAY) * 60 * 60
+                                        + calendar.get(Calendar.MINUTE) * 60
+                                        + calendar.get(Calendar.SECOND)
+                                )
+                        );
+                    }
+                    if (modeServiceInfo.getServiceEndTime() != null) {
+                        Date date = wxModeServiceInfo.getServiceEndTime();
+                        calendar.setTime(date);
+                        modeServiceInfo.setServiceEndTimeStr(
+                                DateUtils.formatMS(calendar.get(Calendar.HOUR_OF_DAY) * 60 * 60
+                                        + calendar.get(Calendar.MINUTE) * 60
+                                        + calendar.get(Calendar.SECOND)
+                                )
+                        );
+                    }
+                }
+            }
+            wxModeRet.setServiceData(wxModeServiceInfoList);
 
             // 将 localTime 转为 分秒 格式
             if (wxModeRet.getModeTime() != null) {
-                wxModeRet.setModeTimeStr(DateUtils.formatMS(wxModeRet.getModeTime().getSecond()));
+                wxModeRet.setModeTimeStr(DateUtils.formatMS(wxModeRet.getModeTime().getLong(ChronoField.SECOND_OF_DAY)));
             }
             wxModeRetList.add(wxModeRet);
         }