From f82dfb7402668e3f78039829bff19fe6276ec918 Mon Sep 17 00:00:00 2001
From: yang <1175@qq.com>
Date: Wed, 11 Sep 2024 15:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96=EF=BC=8C?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=B5=8F=E8=A7=88=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CasesServiceImpl.java        |  4 +-
 .../boecase/vo/CasesBrowsingHistoryVo.java    | 69 -------------------
 2 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
index e5d71468..86989de1 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
@@ -1445,8 +1445,9 @@ public class CasesServiceImpl implements ICasesService {
         List<CasesBrowsingHistoryVo> batchHistoryVoList = allUserdynamicList.stream().map(userDynamic -> {
             CasesBrowsingHistoryVo browsingHistoryVo = new CasesBrowsingHistoryVo();
             // 注意，两者存在重名属性，如ID，会出现覆盖。CasesBrowsingHistoryVo中的ID是案例ID，browsingHistoryId是UserDynamic的ID
-            BeanUtils.copyProperties(userDynamic, browsingHistoryVo);
             browsingHistoryVo.setBrowsingHistoryId(userDynamic.getId());
+            browsingHistoryVo.setContentInfo(userDynamic.getContentInfo());
+            browsingHistoryVo.setEventTime(userDynamic.getEventTime());
             browsingHistoryVo.setId(null);
             if (map.containsKey(userDynamic.getContentId())){
                 // 确保copy案例时，不会覆盖数据
@@ -1462,7 +1463,6 @@ public class CasesServiceImpl implements ICasesService {
                     log.error("browsingHistoryVo copy error", e);
                     throw new RuntimeException(e);
                 }
-
             }
             return browsingHistoryVo;
         }).collect(Collectors.toList());
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesBrowsingHistoryVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesBrowsingHistoryVo.java
index 1669bf76..eea02971 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesBrowsingHistoryVo.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesBrowsingHistoryVo.java
@@ -8,82 +8,13 @@ import java.time.LocalDateTime;
 @Data
 public class CasesBrowsingHistoryVo extends Cases{
 
-
-
-    private static final long serialVersionUID = -2536708166103273425L;
-
-    /**
-     * 事件动态
-     */
-    public final static int TYPE_EVENT=1;
-
-    /**
-     * 其它动态
-     */
-    public final static int TYPE_OTHER=9;
-
-    /**
-     * 类型
-     * 1表事件动态 2表非事件动态
-     * */
-//    private Integer type;
-
     private String browsingHistoryId;
 
-    /**
-     * 动态的标题
-     */
-    private String title;
-
-    /**
-     * 事件的key
-     * */
-    private String eventKey;
-
-    /**
-     * 事件id
-     * */
-    private String eventId;
-
-    /**
-     * 动态月份
-     * yyyyMM
-     * */
-    private Integer month;
-
-    /**
-     * 内容类型
-     * */
-    private String contentType;
-
-    /**
-     * 内容id
-     * */
-    private String contentId;
-
     /**
      * 动态内容
      * */
     private String contentInfo;
 
-    /**
-     * 用户自定义信息
-     */
-    private String cusInfo;
-
-    /**
-     * 动态人id
-     * */
-    private String aid;
-
-    /**
-     * 用户的名称
-     */
-    private String aname;
-    /**
-     * 是否隐藏
-     * */
-    private Boolean hidden;
     private LocalDateTime eventTime;
 
 }