Merge remote-tracking branch 'origin/dev' into dev

pz-admin/src/main/resources/application-dev.yml

@@ -102,13 +102,13 @@ spring:
 spring:
 spring:
   redis:
   redis:
     # 地址
     # 地址
-    host: localhost
+    host: cluster1.prd.nyinhong.com
     # 端口，默认为6379
     # 端口，默认为6379
-    port: 6379
+    port: 6319
     # 数据库索引
     # 数据库索引
     database: 0
     database: 0
     # 密码(如没有密码请注释掉)
     # 密码(如没有密码请注释掉)
-    # password:
+    password: yongqi@2022
     # 连接超时时间
     # 连接超时时间
     timeout: 10s
     timeout: 10s
     # 是否开启ssl
     # 是否开启ssl

pz-applet/src/main/java/com/pz/applet/AccompanyMessageController.java

 package com.pz.applet;
 package com.pz.applet;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Arrays;
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -45,4 +48,13 @@ public class AccompanyMessageController extends BaseController {
         bo.setSender(getUserId());
         bo.setSender(getUserId());
         return R.ok(iMessageService.queryPageList(bo));
         return R.ok(iMessageService.queryPageList(bo));
     }
     }
+
+
+    /**
+     * 获取我与对方聊天时间记录
+     */
+    @GetMapping("/historyTimeList/{toUserId}")
+    public R<List<String>> historyTimeList(@PathVariable Long toUserId) {
+        return R.ok(iMessageService.queryMessageTimeList(getUserId(), toUserId));
+    }
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java

@@ -34,11 +34,4 @@ public class DbghOrderItemVo extends OrderCommonVo {
      */
      */
     private Date visitTime;
     private Date visitTime;
 
 
-    /**
-     * 其他需求
-     */
-    private String description;
-
-
-
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java

@@ -63,14 +63,4 @@ public class DbmyOrderItemVo extends OrderCommonVo {
      */
      */
     private Boolean isRefrigerate;
     private Boolean isRefrigerate;
 
 
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 主订单备注
-     */
-    private String description;
-
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java

@@ -62,16 +62,6 @@ public class DbwzOrderItemVo extends OrderCommonVo {
     private String serviceRequirements;
     private String serviceRequirements;
 
 
     /**
     /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 主订单备注
-     */
-    private String description;
-
-    /**
      * 上次就医情况
      * 上次就医情况
      */
      */
     private String lastMedicalTreatmentSituation;
     private String lastMedicalTreatmentSituation;

pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java

@@ -60,4 +60,14 @@ public class OrderCommonVo {
      */
      */
     private String project;
     private String project;
 
 
+    /**
+     * 其他需求
+     */
+    private String description;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java

@@ -43,18 +43,6 @@ public class YypzOrderItemVo extends OrderCommonVo {
      */
      */
     private Date visitTime;
     private Date visitTime;
 
 
-
-    /**
-     * 需求描述
-     */
-    private String description;
-
-
-    /**
-     * 备注
-     */
-    private String remark;
-
     /**
     /**
      * 用户id
      * 用户id
      */
      */

pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java

@@ -29,11 +29,6 @@ public class ZyphOrderItemVo extends OrderCommonVo {
     private String hospital;
     private String hospital;
 
 
     /**
     /**
-     * 其他需求
-     */
-    private String description;
-
-    /**
      * 陪护日期
      * 陪护日期
      */
      */
     private String visitDate;
     private String visitDate;

pz-system/src/main/java/com/pz/system/service/IMessageService.java

@@ -7,6 +7,7 @@ import com.pz.system.domain.bo.MessageBo;
 import com.pz.system.domain.vo.InformationVo;
 import com.pz.system.domain.vo.InformationVo;
 import com.pz.system.domain.vo.MessageVo;
 import com.pz.system.domain.vo.MessageVo;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 public interface IMessageService {
 public interface IMessageService {
@@ -14,4 +15,11 @@ public interface IMessageService {
      * 分页查询是否有聊天内容
      * 分页查询是否有聊天内容
      */
      */
     List<MessageVo> queryPageList(MessageBo bo);
     List<MessageVo> queryPageList(MessageBo bo);
+
+    /**
+     * 获取我与对方聊天时间记录
+     * @param toUserId
+     * @return
+     */
+    List<String> queryMessageTimeList(Long userId,Long toUserId);
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/MessageServiceImpl.java

@@ -27,7 +27,9 @@ import com.pz.system.service.IMessageService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * 科室Service业务层处理
  * 科室Service业务层处理
@@ -64,4 +66,32 @@ public class MessageServiceImpl implements IMessageService {
         }
         }
         return result;
         return result;
     }
     }
+
+    @Override
+    public List<String> queryMessageTimeList(Long userId, Long toUserId) {
+        List<MessageVo> messageVos = baseMapper.selectVoList(new LambdaQueryWrapper<Message>().eq(Message::getSender, userId)
+            .eq(Message::getReceiver, toUserId).or().eq(Message::getSender, toUserId).eq(Message::getReceiver, userId)
+            .orderByDesc(BaseEntity::getCreateTime));
+
+        if (CollectionUtils.isNotEmpty(messageVos)) {
+            List<Date> times = messageVos.stream().map(MessageVo::getCreateTime).collect(Collectors.toList());
+
+            List<String> formattedDateList = new ArrayList<>();
+
+            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+            for (Date date : times) {
+                // 格式化为目标格式
+                String formattedDate = outputFormat.format(date);
+                // 添加到新的列表
+                formattedDateList.add(formattedDate);
+            }
+            List<String> newList = formattedDateList.stream()
+                .distinct()
+                .sorted(Comparator.reverseOrder())
+                .collect(Collectors.toList());
+            return newList;
+        }
+        return null;
+    }
 }
 }

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                total_order.remark                      as description,
                total_order.remark                      as description,
                dbwz_order.remark,
                dbwz_order.remark,
                dbwz_order.voucher,
                dbwz_order.voucher,
-               total_order.uid              as userId
+               total_order.uid              as userId,
                dbwz_order.voucher,
                dbwz_order.voucher,
                dbwz_order.indications                  as doctor
                dbwz_order.indications                  as doctor
         from total_order
         from total_order