From 49eba85de37c8125905afc23d9fe2c5e90c6737f Mon Sep 17 00:00:00 2001
From: DU <dukang@163.com>
Date: Mon, 1 Mar 2021 17:36:05 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/club/joylink/rtss/services/MapSystemService.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/services/MapSystemService.java b/src/main/java/club/joylink/rtss/services/MapSystemService.java
index 1dd77b69f..89808cd44 100644
--- a/src/main/java/club/joylink/rtss/services/MapSystemService.java
+++ b/src/main/java/club/joylink/rtss/services/MapSystemService.java
@@ -232,12 +232,12 @@ public class MapSystemService implements IMapSystemService {
 
            }
 
-            //默认课程展示
 //            BusinessConsts.Lesson.PrdInfo prdInfo = BusinessConsts.Lesson.PrdInfo.getBy(mapSystem.getPrdType());
 //            if (Objects.nonNull(prdInfo)) {
 //                String defaultLessonName = String.join("-", mapVO.getName(), prdInfo.getName());
-                LessonVO existedDefaultLesson = iLessonService.findSysFaultByMapAndPrdType(mapSystem.getMapId(), mapSystem.getPrdType());
-                if (Objects.nonNull(existedDefaultLesson)) {
+            //默认课程展示
+            LessonVO existedDefaultLesson = iLessonService.findSysFaultByMapAndPrdType(mapSystem.getMapId(), mapSystem.getPrdType());
+                if (Objects.nonNull(existedDefaultLesson) && Objects.equals(MapStatus.Online.getCode(),existedDefaultLesson.getStatus())) {
                     if (lessonVOList.stream().noneMatch(lessonVO -> lessonVO.getId().equals(existedDefaultLesson.getId()))) {
 //                        existedDefaultLesson.setSystemFault(true);
                         lessonVOList.add(existedDefaultLesson);

From cf9481b89e85cb9b9d46749975c8e4146d3293f4 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Wed, 3 Mar 2021 21:30:38 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E9=92=88=E5=AF=B9=E6=88=90=E5=B7=A5?=
 =?UTF-8?q?=E9=99=A2=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/20210303-zhangsai.sql                     |   9 +
 .../joylink/rtss/configuration/WebConfig.java |   5 +
 .../rtss/controller/LearnController.java      |  26 +++
 .../joylink/rtss/dao/LearnMessageDAO.java     |  36 +---
 .../joylink/rtss/entity/LearnComment.java     |  20 +-
 .../rtss/entity/LearnCommentExample.java      |  70 +++++++
 .../joylink/rtss/entity/LearnMessage.java     |  52 ++++-
 .../rtss/entity/LearnMessageExample.java      | 190 ++++++++++++++++++
 .../rtss/entity/LearnMessageWithBLOBs.java    |  89 --------
 .../joylink/rtss/services/ILearnService.java  |  20 ++
 .../joylink/rtss/services/LearnService.java   |  63 +++++-
 .../vo/client/learn/LearnCommentUpdateVO.java |  25 +++
 .../rtss/vo/client/learn/LearnCommentVO.java  |   5 +-
 .../rtss/vo/client/learn/LearnCreateVO.java   |   2 +
 .../vo/client/learn/LearnMessageUpdateVO.java |  23 +++
 .../vo/client/post/LearnMessageCreateVO.java  |   8 +-
 .../rtss/vo/client/post/LearnMessageVO.java   |   7 +-
 .../mybatis/mapper/LearnCommentDAO.xml        |  28 ++-
 .../mybatis/mapper/LearnMessageDAO.xml        | 144 +++++--------
 19 files changed, 588 insertions(+), 234 deletions(-)
 create mode 100644 sql/20210303-zhangsai.sql
 delete mode 100644 src/main/java/club/joylink/rtss/entity/LearnMessageWithBLOBs.java
 create mode 100644 src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentUpdateVO.java
 create mode 100644 src/main/java/club/joylink/rtss/vo/client/learn/LearnMessageUpdateVO.java

diff --git a/sql/20210303-zhangsai.sql b/sql/20210303-zhangsai.sql
new file mode 100644
index 000000000..af7422c41
--- /dev/null
+++ b/sql/20210303-zhangsai.sql
@@ -0,0 +1,9 @@
+alter table learn_comment
+	add user_name varchar(32) null comment '给成都工业临时加的';
+
+alter table learn_message
+	add user_name varchar(32) null comment '给成都工业临时加的';
+
+alter table learn_message modify creator_id bigint null comment '留言者';
+
+alter table learn_comment modify creator_id bigint null comment '创建者';
diff --git a/src/main/java/club/joylink/rtss/configuration/WebConfig.java b/src/main/java/club/joylink/rtss/configuration/WebConfig.java
index dc1352c35..3ced4ff1b 100644
--- a/src/main/java/club/joylink/rtss/configuration/WebConfig.java
+++ b/src/main/java/club/joylink/rtss/configuration/WebConfig.java
@@ -50,6 +50,11 @@ public class WebConfig implements WebMvcConfigurer {
         whiteList.add("/api/license/local");
         // 微信回调接口
         whiteList.add("/api/wechatPay/receive");
+        // 成都工业留言板
+        whiteList.add("/api/learn/cgy/message/create");
+        whiteList.add("/api/learn/cgy/{messageId}/comment");
+        whiteList.add("/api/learn/{postId}/message/pagedQuery/postId");
+        whiteList.add("/api/learn/{messageId}/comment");
         registry.addInterceptor(authenticateInterceptor).excludePathPatterns(whiteList);
     }
 
diff --git a/src/main/java/club/joylink/rtss/controller/LearnController.java b/src/main/java/club/joylink/rtss/controller/LearnController.java
index 994da8c9b..982a470f2 100644
--- a/src/main/java/club/joylink/rtss/controller/LearnController.java
+++ b/src/main/java/club/joylink/rtss/controller/LearnController.java
@@ -91,6 +91,12 @@ public class LearnController {
         return iLearnService.createMessage(messageCreateVO, user);
     }
 
+    @ApiOperation("成工院留言")
+    @PostMapping("/cgy/message/create")
+    public long cgyCreateMessage(@RequestBody @Validated LearnMessageCreateVO messageCreateVO) {
+        return iLearnService.cgyCreateMessage(messageCreateVO);
+    }
+
     @ApiOperation("分页查询留言")
     @GetMapping("/{postId}/message/pagedQuery/postId")
     public PageVO<LearnMessageVO> pagedQueryMessageByPostId(@PathVariable Long postId, LearnMessagePagedQueryVO queryVO) {
@@ -149,6 +155,13 @@ public class LearnController {
         iLearnService.addComment(messageId, commentCreateVO, user);
     }
 
+    @ApiOperation(value = "成工院评论")
+    @PostMapping(path = "/cgy/{messageId}/comment")
+    public void cygComment(@PathVariable Long messageId,
+                        @RequestBody @Validated(value = LearnCommentCreateCheck.class) LearnCreateVO commentCreateVO) {
+        iLearnService.cgyAddComment(messageId, commentCreateVO);
+    }
+
     @ApiOperation(value = "回复")
     @PostMapping(path = "/{messageId}/{commentId}/comment")
     public void comment(@PathVariable Long messageId, @PathVariable Long commentId,
@@ -187,4 +200,17 @@ public class LearnController {
         iLearnService.userDeleteComment(commentId, user);
     }
 
+    //----------------------------------------- 改数据 -----------------------------------------
+    @ApiOperation(value = "管理员修改留言数据")
+    @DeleteMapping(path = "/admin/update/message")
+    public void adminUpdateMessage(LearnMessageUpdateVO messageUpdateVO) {
+        iLearnService.adminUpdateMessage(messageUpdateVO);
+    }
+
+    @ApiOperation(value = "管理员修改评论数据")
+    @DeleteMapping(path = "/admin/update/comment")
+    public void adminUpdateComment(LearnCommentUpdateVO commentUpdateVO) {
+        iLearnService.adminUpdateComment(commentUpdateVO);
+    }
+
 }
diff --git a/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java b/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java
index 4621698f0..9b20db6f1 100644
--- a/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java
+++ b/src/main/java/club/joylink/rtss/dao/LearnMessageDAO.java
@@ -2,45 +2,18 @@ package club.joylink.rtss.dao;
 
 import club.joylink.rtss.entity.LearnMessage;
 import club.joylink.rtss.entity.LearnMessageExample;
-import club.joylink.rtss.entity.LearnMessageWithBLOBs;
 import club.joylink.rtss.vo.client.post.LearnMessagePagedQueryVO;
 import club.joylink.rtss.vo.client.post.LearnMessageVO;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * LearnMessageDAO继承基类
+ */
 @Repository
-public interface LearnMessageDAO {
-    long countByExample(LearnMessageExample example);
-
-    int deleteByExample(LearnMessageExample example);
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(LearnMessageWithBLOBs record);
-
-    int insertSelective(LearnMessageWithBLOBs record);
-
-    List<LearnMessageWithBLOBs> selectByExampleWithBLOBs(LearnMessageExample example);
-
-    List<LearnMessage> selectByExample(LearnMessageExample example);
-
-    LearnMessageWithBLOBs selectByPrimaryKey(Long id);
-
-    int updateByExampleSelective(@Param("record") LearnMessageWithBLOBs record, @Param("example") LearnMessageExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") LearnMessageWithBLOBs record, @Param("example") LearnMessageExample example);
-
-    int updateByExample(@Param("record") LearnMessage record, @Param("example") LearnMessageExample example);
-
-    int updateByPrimaryKeySelective(LearnMessageWithBLOBs record);
-
-    int updateByPrimaryKeyWithBLOBs(LearnMessageWithBLOBs record);
-
-    int updateByPrimaryKey(LearnMessage record);
-
+public interface LearnMessageDAO extends MyBatisBaseDao<LearnMessage, Long, LearnMessageExample> {
     @Select("<script>" +
             "SELECT\n" +
             "   learn_message.id AS id,\n" +
@@ -52,6 +25,7 @@ public interface LearnMessageDAO {
 //               "learn_message.`like` AS `like`,\n" +
 //               "learn_message.unlike AS unlike,\n" +
             "   learn_message.topping AS topping,\n" +
+            "   learn_message.user_name AS cgyUserName,\n" +
             "   sys_user.nickname AS creatorNickName,\n" +
             "   sys_user.avatar_path AS creatorAvatarPath\n" +
 //            "learn_comment.id AS commentList\n" +
diff --git a/src/main/java/club/joylink/rtss/entity/LearnComment.java b/src/main/java/club/joylink/rtss/entity/LearnComment.java
index f953ab9f0..0f651cb80 100644
--- a/src/main/java/club/joylink/rtss/entity/LearnComment.java
+++ b/src/main/java/club/joylink/rtss/entity/LearnComment.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * learn_comment
  * @author 
+ * 学习吧-回复
  */
 public class LearnComment implements Serializable {
     private Long id;
@@ -50,6 +50,11 @@ public class LearnComment implements Serializable {
      */
     private Integer unlike;
 
+    /**
+     * 给成都工业临时加的
+     */
+    private String userName;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -124,6 +129,14 @@ public class LearnComment implements Serializable {
         this.unlike = unlike;
     }
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -144,7 +157,8 @@ public class LearnComment implements Serializable {
             && (this.getRootId() == null ? other.getRootId() == null : this.getRootId().equals(other.getRootId()))
             && (this.getParentId() == null ? other.getParentId() == null : this.getParentId().equals(other.getParentId()))
             && (this.getLike() == null ? other.getLike() == null : this.getLike().equals(other.getLike()))
-            && (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()));
+            && (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()))
+            && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()));
     }
 
     @Override
@@ -160,6 +174,7 @@ public class LearnComment implements Serializable {
         result = prime * result + ((getParentId() == null) ? 0 : getParentId().hashCode());
         result = prime * result + ((getLike() == null) ? 0 : getLike().hashCode());
         result = prime * result + ((getUnlike() == null) ? 0 : getUnlike().hashCode());
+        result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
         return result;
     }
 
@@ -178,6 +193,7 @@ public class LearnComment implements Serializable {
         sb.append(", parentId=").append(parentId);
         sb.append(", like=").append(like);
         sb.append(", unlike=").append(unlike);
+        sb.append(", userName=").append(userName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
diff --git a/src/main/java/club/joylink/rtss/entity/LearnCommentExample.java b/src/main/java/club/joylink/rtss/entity/LearnCommentExample.java
index 3f0e01c7f..0360b632a 100644
--- a/src/main/java/club/joylink/rtss/entity/LearnCommentExample.java
+++ b/src/main/java/club/joylink/rtss/entity/LearnCommentExample.java
@@ -674,6 +674,76 @@ public class LearnCommentExample {
             addCriterion("unlike not between", value1, value2, "unlike");
             return (Criteria) this;
         }
+
+        public Criteria andUserNameIsNull() {
+            addCriterion("user_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIsNotNull() {
+            addCriterion("user_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameEqualTo(String value) {
+            addCriterion("user_name =", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotEqualTo(String value) {
+            addCriterion("user_name <>", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameGreaterThan(String value) {
+            addCriterion("user_name >", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameGreaterThanOrEqualTo(String value) {
+            addCriterion("user_name >=", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLessThan(String value) {
+            addCriterion("user_name <", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLessThanOrEqualTo(String value) {
+            addCriterion("user_name <=", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLike(String value) {
+            addCriterion("user_name like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotLike(String value) {
+            addCriterion("user_name not like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIn(List<String> values) {
+            addCriterion("user_name in", values, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotIn(List<String> values) {
+            addCriterion("user_name not in", values, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameBetween(String value1, String value2) {
+            addCriterion("user_name between", value1, value2, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotBetween(String value1, String value2) {
+            addCriterion("user_name not between", value1, value2, "userName");
+            return (Criteria) this;
+        }
     }
 
     /**
diff --git a/src/main/java/club/joylink/rtss/entity/LearnMessage.java b/src/main/java/club/joylink/rtss/entity/LearnMessage.java
index 6c013eebe..7ca8b02f0 100644
--- a/src/main/java/club/joylink/rtss/entity/LearnMessage.java
+++ b/src/main/java/club/joylink/rtss/entity/LearnMessage.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * learn_message
  * @author 
+ * 帖子留言
  */
 public class LearnMessage implements Serializable {
     private Long id;
@@ -35,11 +35,26 @@ public class LearnMessage implements Serializable {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 赞数
+     */
+    private Integer like;
+
+    /**
+     * 踩数
+     */
+    private Integer unlike;
+
     /**
      * 是否置顶
      */
     private Boolean topping;
 
+    /**
+     * 给成都工业临时加的
+     */
+    private String userName;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -90,6 +105,22 @@ public class LearnMessage implements Serializable {
         this.createTime = createTime;
     }
 
+    public Integer getLike() {
+        return like;
+    }
+
+    public void setLike(Integer like) {
+        this.like = like;
+    }
+
+    public Integer getUnlike() {
+        return unlike;
+    }
+
+    public void setUnlike(Integer unlike) {
+        this.unlike = unlike;
+    }
+
     public Boolean getTopping() {
         return topping;
     }
@@ -98,6 +129,14 @@ public class LearnMessage implements Serializable {
         this.topping = topping;
     }
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -116,7 +155,10 @@ public class LearnMessage implements Serializable {
             && (this.getPictureUrls() == null ? other.getPictureUrls() == null : this.getPictureUrls().equals(other.getPictureUrls()))
             && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getTopping() == null ? other.getTopping() == null : this.getTopping().equals(other.getTopping()));
+            && (this.getLike() == null ? other.getLike() == null : this.getLike().equals(other.getLike()))
+            && (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()))
+            && (this.getTopping() == null ? other.getTopping() == null : this.getTopping().equals(other.getTopping()))
+            && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()));
     }
 
     @Override
@@ -129,7 +171,10 @@ public class LearnMessage implements Serializable {
         result = prime * result + ((getPictureUrls() == null) ? 0 : getPictureUrls().hashCode());
         result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getLike() == null) ? 0 : getLike().hashCode());
+        result = prime * result + ((getUnlike() == null) ? 0 : getUnlike().hashCode());
         result = prime * result + ((getTopping() == null) ? 0 : getTopping().hashCode());
+        result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
         return result;
     }
 
@@ -145,7 +190,10 @@ public class LearnMessage implements Serializable {
         sb.append(", pictureUrls=").append(pictureUrls);
         sb.append(", creatorId=").append(creatorId);
         sb.append(", createTime=").append(createTime);
+        sb.append(", like=").append(like);
+        sb.append(", unlike=").append(unlike);
         sb.append(", topping=").append(topping);
+        sb.append(", userName=").append(userName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
diff --git a/src/main/java/club/joylink/rtss/entity/LearnMessageExample.java b/src/main/java/club/joylink/rtss/entity/LearnMessageExample.java
index cfe97efd7..4baf362d7 100644
--- a/src/main/java/club/joylink/rtss/entity/LearnMessageExample.java
+++ b/src/main/java/club/joylink/rtss/entity/LearnMessageExample.java
@@ -505,6 +505,126 @@ public class LearnMessageExample {
             return (Criteria) this;
         }
 
+        public Criteria andLikeIsNull() {
+            addCriterion("`like` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeIsNotNull() {
+            addCriterion("`like` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeEqualTo(Integer value) {
+            addCriterion("`like` =", value, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeNotEqualTo(Integer value) {
+            addCriterion("`like` <>", value, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeGreaterThan(Integer value) {
+            addCriterion("`like` >", value, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`like` >=", value, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeLessThan(Integer value) {
+            addCriterion("`like` <", value, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeLessThanOrEqualTo(Integer value) {
+            addCriterion("`like` <=", value, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeIn(List<Integer> values) {
+            addCriterion("`like` in", values, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeNotIn(List<Integer> values) {
+            addCriterion("`like` not in", values, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeBetween(Integer value1, Integer value2) {
+            addCriterion("`like` between", value1, value2, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andLikeNotBetween(Integer value1, Integer value2) {
+            addCriterion("`like` not between", value1, value2, "like");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeIsNull() {
+            addCriterion("unlike is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeIsNotNull() {
+            addCriterion("unlike is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeEqualTo(Integer value) {
+            addCriterion("unlike =", value, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeNotEqualTo(Integer value) {
+            addCriterion("unlike <>", value, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeGreaterThan(Integer value) {
+            addCriterion("unlike >", value, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("unlike >=", value, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeLessThan(Integer value) {
+            addCriterion("unlike <", value, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeLessThanOrEqualTo(Integer value) {
+            addCriterion("unlike <=", value, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeIn(List<Integer> values) {
+            addCriterion("unlike in", values, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeNotIn(List<Integer> values) {
+            addCriterion("unlike not in", values, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeBetween(Integer value1, Integer value2) {
+            addCriterion("unlike between", value1, value2, "unlike");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnlikeNotBetween(Integer value1, Integer value2) {
+            addCriterion("unlike not between", value1, value2, "unlike");
+            return (Criteria) this;
+        }
+
         public Criteria andToppingIsNull() {
             addCriterion("topping is null");
             return (Criteria) this;
@@ -564,6 +684,76 @@ public class LearnMessageExample {
             addCriterion("topping not between", value1, value2, "topping");
             return (Criteria) this;
         }
+
+        public Criteria andUserNameIsNull() {
+            addCriterion("user_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIsNotNull() {
+            addCriterion("user_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameEqualTo(String value) {
+            addCriterion("user_name =", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotEqualTo(String value) {
+            addCriterion("user_name <>", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameGreaterThan(String value) {
+            addCriterion("user_name >", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameGreaterThanOrEqualTo(String value) {
+            addCriterion("user_name >=", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLessThan(String value) {
+            addCriterion("user_name <", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLessThanOrEqualTo(String value) {
+            addCriterion("user_name <=", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLike(String value) {
+            addCriterion("user_name like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotLike(String value) {
+            addCriterion("user_name not like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIn(List<String> values) {
+            addCriterion("user_name in", values, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotIn(List<String> values) {
+            addCriterion("user_name not in", values, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameBetween(String value1, String value2) {
+            addCriterion("user_name between", value1, value2, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotBetween(String value1, String value2) {
+            addCriterion("user_name not between", value1, value2, "userName");
+            return (Criteria) this;
+        }
     }
 
     /**
diff --git a/src/main/java/club/joylink/rtss/entity/LearnMessageWithBLOBs.java b/src/main/java/club/joylink/rtss/entity/LearnMessageWithBLOBs.java
deleted file mode 100644
index 5238d8f27..000000000
--- a/src/main/java/club/joylink/rtss/entity/LearnMessageWithBLOBs.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package club.joylink.rtss.entity;
-
-import java.io.Serializable;
-
-/**
- * learn_message
- * @author 
- */
-public class LearnMessageWithBLOBs extends LearnMessage implements Serializable {
-    /**
-     * 点赞的用户id
-     */
-    private String like;
-
-    /**
-     * 点踩的用户id
-     */
-    private String unlike;
-
-    private static final long serialVersionUID = 1L;
-
-    public String getLike() {
-        return like;
-    }
-
-    public void setLike(String like) {
-        this.like = like;
-    }
-
-    public String getUnlike() {
-        return unlike;
-    }
-
-    public void setUnlike(String unlike) {
-        this.unlike = unlike;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        LearnMessageWithBLOBs other = (LearnMessageWithBLOBs) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getPostId() == null ? other.getPostId() == null : this.getPostId().equals(other.getPostId()))
-            && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent()))
-            && (this.getPictureUrls() == null ? other.getPictureUrls() == null : this.getPictureUrls().equals(other.getPictureUrls()))
-            && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getTopping() == null ? other.getTopping() == null : this.getTopping().equals(other.getTopping()))
-            && (this.getLike() == null ? other.getLike() == null : this.getLike().equals(other.getLike()))
-            && (this.getUnlike() == null ? other.getUnlike() == null : this.getUnlike().equals(other.getUnlike()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getPostId() == null) ? 0 : getPostId().hashCode());
-        result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode());
-        result = prime * result + ((getPictureUrls() == null) ? 0 : getPictureUrls().hashCode());
-        result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getTopping() == null) ? 0 : getTopping().hashCode());
-        result = prime * result + ((getLike() == null) ? 0 : getLike().hashCode());
-        result = prime * result + ((getUnlike() == null) ? 0 : getUnlike().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", like=").append(like);
-        sb.append(", unlike=").append(unlike);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/club/joylink/rtss/services/ILearnService.java b/src/main/java/club/joylink/rtss/services/ILearnService.java
index 1093e5916..df5b741f9 100644
--- a/src/main/java/club/joylink/rtss/services/ILearnService.java
+++ b/src/main/java/club/joylink/rtss/services/ILearnService.java
@@ -126,6 +126,26 @@ public interface ILearnService {
      */
     void updatePost(Long postId, LearnPostUpdateVO updateVO, UserVO user);
 
+    /**
+     * 成都工业添加留言
+     */
+    long cgyCreateMessage(LearnMessageCreateVO messageCreateVO);
+
+    /**
+     * 成都工业添加评论
+     */
+    void cgyAddComment(Long messageId, LearnCreateVO commentCreateVO);
+
+    /**
+     * 管理员修改留言数据
+     */
+    void adminUpdateMessage(LearnMessageUpdateVO messageUpdateVO);
+
+    /**
+     * 管理员修改评论数据
+     */
+    void adminUpdateComment(LearnCommentUpdateVO commitUpdateVO);
+
 //    /**
 //     * 点赞留言
 //     */
diff --git a/src/main/java/club/joylink/rtss/services/LearnService.java b/src/main/java/club/joylink/rtss/services/LearnService.java
index 52b401fab..3968eded7 100644
--- a/src/main/java/club/joylink/rtss/services/LearnService.java
+++ b/src/main/java/club/joylink/rtss/services/LearnService.java
@@ -157,8 +157,10 @@ public class LearnService implements ILearnService {
     private LearnCommentVO convertComment(LearnComment comment) {
         LearnCommentVO commentVO = new LearnCommentVO(comment);
         // 用户昵称
-        String nickname = iSysUserService.findUserById(comment.getCreatorId()).getNickname();
-        commentVO.setUserNickname(nickname);
+        if (comment.getCreatorId() != null) {
+            String nickname = iSysUserService.findUserById(comment.getCreatorId()).getNickname();
+            commentVO.setUserNickname(nickname);
+        }
         // 回复的用户的昵称
         if (comment.getParentId() != null) {
             commentVO.setReplyUserNickName(iSysUserService.findUserById(comment.getParentId()).getNickname());
@@ -171,15 +173,14 @@ public class LearnService implements ILearnService {
     }
 
     @Override
-    public void addComment(Long messageId, LearnCreateVO postCreateVO, UserVO userVO) {
+    public void addComment(Long messageId, LearnCreateVO commentCreateVO, UserVO userVO) {
         checkMessageExist(messageId);
         if (SystemEnv.isPrdEnv(otherConfig.getEnv())) {
-            this.checkContent(postCreateVO.getContent());
+            this.checkContent(commentCreateVO.getContent());
         }
         LearnComment comment = new LearnComment();
-        comment.setContent(postCreateVO.getContent());
+        comment.setContent(commentCreateVO.getContent());
         comment.setMessageId(messageId);
-
         comment.setCreatorId(userVO.getId());
         comment.setCreateTime(LocalDateTime.now());
         learnCommentDAO.insertSelective(comment);
@@ -274,7 +275,7 @@ public class LearnService implements ILearnService {
         if (SystemEnv.isPrdEnv(otherConfig.getEnv())) {
             this.checkContent(messageCreateVO.getContent());
         }
-        LearnMessageWithBLOBs message = messageCreateVO.convert2DB(user.getId());
+        LearnMessage message = messageCreateVO.convert2DB(user.getId());
         learnMessageDAO.insert(message);
         LearnMessageExample example = new LearnMessageExample();
         example.createCriteria().andPostIdEqualTo(messageCreateVO.getPostId());
@@ -338,6 +339,48 @@ public class LearnService implements ILearnService {
         learnPostDAO.updateByPrimaryKey(entity);
     }
 
+    @Override
+    public long cgyCreateMessage(LearnMessageCreateVO messageCreateVO) {
+        BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(StringUtils.hasText(messageCreateVO.getContent()),
+                "内容不能空白");
+        LearnMessage message = messageCreateVO.convert2DB(1L);
+        message.setCreatorId(null);
+        message.setUserName(messageCreateVO.getUserName());
+        learnMessageDAO.insert(message);
+        LearnMessageExample example = new LearnMessageExample();
+        example.createCriteria().andPostIdEqualTo(messageCreateVO.getPostId());
+        return learnMessageDAO.countByExample(example);
+    }
+
+    @Override
+    public void cgyAddComment(Long messageId, LearnCreateVO commentCreateVO) {
+        checkMessageExist(messageId);
+        LearnComment comment = new LearnComment();
+        comment.setContent(commentCreateVO.getContent());
+        comment.setMessageId(messageId);
+        comment.setCreateTime(LocalDateTime.now());
+        comment.setUserName(commentCreateVO.getUserName());
+        learnCommentDAO.insertSelective(comment);
+    }
+
+    @Override
+    public void adminUpdateMessage(LearnMessageUpdateVO messageUpdateVO) {
+        LearnMessage messageEntity = getMessageEntity(messageUpdateVO.getId());
+        messageEntity.setContent(messageUpdateVO.getContent());
+        messageEntity.setCreateTime(messageUpdateVO.getCreateTime());
+        learnMessageDAO.updateByPrimaryKey(messageEntity);
+    }
+
+    @Override
+    public void adminUpdateComment(LearnCommentUpdateVO commentUpdateVO) {
+        LearnComment commentEntity = getCommentEntity(commentUpdateVO.getId());
+        commentEntity.setMessageId(commentUpdateVO.getMessageId());
+        commentEntity.setContent(commentUpdateVO.getContent());
+        commentEntity.setCreatorId(commentUpdateVO.getCreatorId());
+        commentEntity.setCreateTime(commentUpdateVO.getCreateTime());
+        learnCommentDAO.updateByPrimaryKey(commentEntity);
+    }
+
     //    @Override
 //    public Integer likeMessage(Long messageId) {
 //        LearnMessageWithBLOBs message = getMessage(messageId);
@@ -408,12 +451,12 @@ public class LearnService implements ILearnService {
                 String.format("id为[%s]的留言不存在", messageId));
     }
 
-    private LearnMessageWithBLOBs findMessageEntity(Long messageId) {
+    private LearnMessage findMessageEntity(Long messageId) {
         return learnMessageDAO.selectByPrimaryKey(messageId);
     }
 
-    private LearnMessageWithBLOBs getMessageEntity(Long messageId) {
-        LearnMessageWithBLOBs message = findMessageEntity(messageId);
+    private LearnMessage getMessageEntity(Long messageId) {
+        LearnMessage message = findMessageEntity(messageId);
         BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotNull(message, String.format("id为[%s]的留言不存在", messageId));
         return message;
     }
diff --git a/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentUpdateVO.java b/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentUpdateVO.java
new file mode 100644
index 000000000..8912d654d
--- /dev/null
+++ b/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentUpdateVO.java
@@ -0,0 +1,25 @@
+package club.joylink.rtss.vo.client.learn;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * 评论数据更新
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class LearnCommentUpdateVO {
+    private Long id;
+
+    private Long messageId;
+
+    private String content;
+
+    private Long creatorId;
+
+    private LocalDateTime createTime;
+}
diff --git a/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentVO.java b/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentVO.java
index 55a907344..2917b6cac 100644
--- a/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/learn/LearnCommentVO.java
@@ -1,9 +1,9 @@
 package club.joylink.rtss.vo.client.learn;
 
+import club.joylink.rtss.entity.LearnComment;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import club.joylink.rtss.entity.LearnComment;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -51,6 +51,8 @@ public class LearnCommentVO {
     @ApiModelProperty(value = "回复数")
     private Long commentCount;
 
+    private String cgyUserName;
+
     public LearnCommentVO(LearnComment comment) {
         this.id = comment.getId();
         this.messageId = comment.getMessageId();
@@ -60,5 +62,6 @@ public class LearnCommentVO {
         this.unlike = comment.getUnlike();
         this.commentTime = comment.getCreateTime();
         this.replyUserId = comment.getParentId();
+        this.cgyUserName = comment.getUserName();
     }
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/learn/LearnCreateVO.java b/src/main/java/club/joylink/rtss/vo/client/learn/LearnCreateVO.java
index 88e7c4283..adecfb9fd 100644
--- a/src/main/java/club/joylink/rtss/vo/client/learn/LearnCreateVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/learn/LearnCreateVO.java
@@ -16,4 +16,6 @@ public class LearnCreateVO {
 
     @NotBlank(message = "内容不能为空", groups = {LearnPostCreateCheck.class, LearnCommentCreateCheck.class})
     private String content;
+
+    private String userName;
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/learn/LearnMessageUpdateVO.java b/src/main/java/club/joylink/rtss/vo/client/learn/LearnMessageUpdateVO.java
new file mode 100644
index 000000000..31dd1008a
--- /dev/null
+++ b/src/main/java/club/joylink/rtss/vo/client/learn/LearnMessageUpdateVO.java
@@ -0,0 +1,23 @@
+package club.joylink.rtss.vo.client.learn;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * 留言板留言更新
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class LearnMessageUpdateVO {
+    private Long id;
+
+    private String content;
+
+    private LocalDateTime createTime;
+
+    private Long creatorId;
+}
diff --git a/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageCreateVO.java b/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageCreateVO.java
index 8d7abe677..2893fe939 100644
--- a/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageCreateVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageCreateVO.java
@@ -1,6 +1,6 @@
 package club.joylink.rtss.vo.client.post;
 
-import club.joylink.rtss.entity.LearnMessageWithBLOBs;
+import club.joylink.rtss.entity.LearnMessage;
 import club.joylink.rtss.util.JsonUtils;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -20,10 +20,12 @@ public class LearnMessageCreateVO {
 
     private String content;
 
+    private String userName;
+
     private List<String> pictureUrls;
 
-    public LearnMessageWithBLOBs convert2DB(Long userId) {
-        LearnMessageWithBLOBs message = new LearnMessageWithBLOBs();
+    public LearnMessage convert2DB(Long userId) {
+        LearnMessage message = new LearnMessage();
         message.setPostId(postId);
         message.setContent(content);
         message.setPictureUrls(JsonUtils.writeValueAsString(pictureUrls));
diff --git a/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageVO.java b/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageVO.java
index b611e1807..65aa2b14e 100644
--- a/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/post/LearnMessageVO.java
@@ -1,10 +1,10 @@
 package club.joylink.rtss.vo.client.post;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import club.joylink.rtss.entity.LearnMessage;
 import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.vo.client.PageVO;
 import club.joylink.rtss.vo.client.learn.LearnCommentVO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -71,6 +71,11 @@ public class LearnMessageVO {
      */
     private Boolean topping;
 
+    /**
+     * 成工业留言板用户名
+     */
+    private String cgyUserName;
+
     private PageVO<LearnCommentVO> comments;
 
     public LearnMessageVO(LearnMessage message) {
diff --git a/src/main/resources/mybatis/mapper/LearnCommentDAO.xml b/src/main/resources/mybatis/mapper/LearnCommentDAO.xml
index 0c3bb4b03..9374ca7e4 100644
--- a/src/main/resources/mybatis/mapper/LearnCommentDAO.xml
+++ b/src/main/resources/mybatis/mapper/LearnCommentDAO.xml
@@ -11,6 +11,7 @@
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
     <result column="like" jdbcType="INTEGER" property="like" />
     <result column="unlike" jdbcType="INTEGER" property="unlike" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, message_id, content, creator_id, create_time, root_id, parent_id, `like`, unlike
+    id, message_id, content, creator_id, create_time, root_id, parent_id, `like`, unlike, 
+    user_name
   </sql>
   <select id="selectByExample" parameterType="club.joylink.rtss.entity.LearnCommentExample" resultMap="BaseResultMap">
     select
@@ -114,10 +116,12 @@
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.LearnComment" useGeneratedKeys="true">
     insert into learn_comment (message_id, content, creator_id, 
       create_time, root_id, parent_id, 
-      `like`, unlike)
+      `like`, unlike, user_name
+      )
     values (#{messageId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT}, 
       #{createTime,jdbcType=TIMESTAMP}, #{rootId,jdbcType=BIGINT}, #{parentId,jdbcType=BIGINT}, 
-      #{like,jdbcType=INTEGER}, #{unlike,jdbcType=INTEGER})
+      #{like,jdbcType=INTEGER}, #{unlike,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.LearnComment" useGeneratedKeys="true">
     insert into learn_comment
@@ -146,6 +150,9 @@
       <if test="unlike != null">
         unlike,
       </if>
+      <if test="userName != null">
+        user_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="messageId != null">
@@ -172,6 +179,9 @@
       <if test="unlike != null">
         #{unlike,jdbcType=INTEGER},
       </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="club.joylink.rtss.entity.LearnCommentExample" resultType="java.lang.Long">
@@ -210,6 +220,9 @@
       <if test="record.unlike != null">
         unlike = #{record.unlike,jdbcType=INTEGER},
       </if>
+      <if test="record.userName != null">
+        user_name = #{record.userName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -225,7 +238,8 @@
       root_id = #{record.rootId,jdbcType=BIGINT},
       parent_id = #{record.parentId,jdbcType=BIGINT},
       `like` = #{record.like,jdbcType=INTEGER},
-      unlike = #{record.unlike,jdbcType=INTEGER}
+      unlike = #{record.unlike,jdbcType=INTEGER},
+      user_name = #{record.userName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -257,6 +271,9 @@
       <if test="unlike != null">
         unlike = #{unlike,jdbcType=INTEGER},
       </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -269,7 +286,8 @@
       root_id = #{rootId,jdbcType=BIGINT},
       parent_id = #{parentId,jdbcType=BIGINT},
       `like` = #{like,jdbcType=INTEGER},
-      unlike = #{unlike,jdbcType=INTEGER}
+      unlike = #{unlike,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/LearnMessageDAO.xml b/src/main/resources/mybatis/mapper/LearnMessageDAO.xml
index 2782a575a..0843adf91 100644
--- a/src/main/resources/mybatis/mapper/LearnMessageDAO.xml
+++ b/src/main/resources/mybatis/mapper/LearnMessageDAO.xml
@@ -8,11 +8,10 @@
     <result column="picture_urls" jdbcType="VARCHAR" property="pictureUrls" />
     <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="topping" jdbcType="BIT" property="topping" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="club.joylink.rtss.entity.LearnMessageWithBLOBs">
-    <result column="like" jdbcType="LONGVARCHAR" property="like" />
-    <result column="unlike" jdbcType="LONGVARCHAR" property="unlike" />
+    <result column="like" jdbcType="INTEGER" property="like" />
+    <result column="unlike" jdbcType="INTEGER" property="unlike" />
+    <result column="topping" jdbcType="TINYINT" property="topping" />
+    <result column="user_name" jdbcType="VARCHAR" property="userName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -73,35 +72,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, post_id, content, picture_urls, creator_id, create_time, topping
+    id, post_id, content, picture_urls, creator_id, create_time, `like`, unlike, topping, 
+    user_name
   </sql>
-  <sql id="Blob_Column_List">
-    `like`, unlike
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="club.joylink.rtss.entity.LearnMessageExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from learn_message
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null">
-      <if test="offset != null">
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null">
-        limit ${limit}
-      </if>
-    </if>
-  </select>
   <select id="selectByExample" parameterType="club.joylink.rtss.entity.LearnMessageExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -124,11 +97,9 @@
       </if>
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from learn_message
     where id = #{id,jdbcType=BIGINT}
   </select>
@@ -142,15 +113,17 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.LearnMessageWithBLOBs" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.LearnMessage" useGeneratedKeys="true">
     insert into learn_message (post_id, content, picture_urls, 
-      creator_id, create_time, topping, 
-      `like`, unlike)
+      creator_id, create_time, `like`, 
+      unlike, topping, user_name
+      )
     values (#{postId,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{pictureUrls,jdbcType=VARCHAR}, 
-      #{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{topping,jdbcType=BIT}, 
-      #{like,jdbcType=LONGVARCHAR}, #{unlike,jdbcType=LONGVARCHAR})
+      #{creatorId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{like,jdbcType=INTEGER}, 
+      #{unlike,jdbcType=INTEGER}, #{topping,jdbcType=TINYINT}, #{userName,jdbcType=VARCHAR}
+      )
   </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.LearnMessageWithBLOBs" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="club.joylink.rtss.entity.LearnMessage" useGeneratedKeys="true">
     insert into learn_message
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="postId != null">
@@ -168,15 +141,18 @@
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="topping != null">
-        topping,
-      </if>
       <if test="like != null">
         `like`,
       </if>
       <if test="unlike != null">
         unlike,
       </if>
+      <if test="topping != null">
+        topping,
+      </if>
+      <if test="userName != null">
+        user_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="postId != null">
@@ -194,14 +170,17 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="topping != null">
-        #{topping,jdbcType=BIT},
-      </if>
       <if test="like != null">
-        #{like,jdbcType=LONGVARCHAR},
+        #{like,jdbcType=INTEGER},
       </if>
       <if test="unlike != null">
-        #{unlike,jdbcType=LONGVARCHAR},
+        #{unlike,jdbcType=INTEGER},
+      </if>
+      <if test="topping != null">
+        #{topping,jdbcType=TINYINT},
+      </if>
+      <if test="userName != null">
+        #{userName,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -232,35 +211,23 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.topping != null">
-        topping = #{record.topping,jdbcType=BIT},
-      </if>
       <if test="record.like != null">
-        `like` = #{record.like,jdbcType=LONGVARCHAR},
+        `like` = #{record.like,jdbcType=INTEGER},
       </if>
       <if test="record.unlike != null">
-        unlike = #{record.unlike,jdbcType=LONGVARCHAR},
+        unlike = #{record.unlike,jdbcType=INTEGER},
+      </if>
+      <if test="record.topping != null">
+        topping = #{record.topping,jdbcType=TINYINT},
+      </if>
+      <if test="record.userName != null">
+        user_name = #{record.userName,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update learn_message
-    set id = #{record.id,jdbcType=BIGINT},
-      post_id = #{record.postId,jdbcType=BIGINT},
-      content = #{record.content,jdbcType=VARCHAR},
-      picture_urls = #{record.pictureUrls,jdbcType=VARCHAR},
-      creator_id = #{record.creatorId,jdbcType=BIGINT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      topping = #{record.topping,jdbcType=BIT},
-      `like` = #{record.like,jdbcType=LONGVARCHAR},
-      unlike = #{record.unlike,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     update learn_message
     set id = #{record.id,jdbcType=BIGINT},
@@ -269,12 +236,15 @@
       picture_urls = #{record.pictureUrls,jdbcType=VARCHAR},
       creator_id = #{record.creatorId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      topping = #{record.topping,jdbcType=BIT}
+      `like` = #{record.like,jdbcType=INTEGER},
+      unlike = #{record.unlike,jdbcType=INTEGER},
+      topping = #{record.topping,jdbcType=TINYINT},
+      user_name = #{record.userName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.LearnMessageWithBLOBs">
+  <update id="updateByPrimaryKeySelective" parameterType="club.joylink.rtss.entity.LearnMessage">
     update learn_message
     <set>
       <if test="postId != null">
@@ -292,30 +262,21 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="topping != null">
-        topping = #{topping,jdbcType=BIT},
-      </if>
       <if test="like != null">
-        `like` = #{like,jdbcType=LONGVARCHAR},
+        `like` = #{like,jdbcType=INTEGER},
       </if>
       <if test="unlike != null">
-        unlike = #{unlike,jdbcType=LONGVARCHAR},
+        unlike = #{unlike,jdbcType=INTEGER},
+      </if>
+      <if test="topping != null">
+        topping = #{topping,jdbcType=TINYINT},
+      </if>
+      <if test="userName != null">
+        user_name = #{userName,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="club.joylink.rtss.entity.LearnMessageWithBLOBs">
-    update learn_message
-    set post_id = #{postId,jdbcType=BIGINT},
-      content = #{content,jdbcType=VARCHAR},
-      picture_urls = #{pictureUrls,jdbcType=VARCHAR},
-      creator_id = #{creatorId,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      topping = #{topping,jdbcType=BIT},
-      `like` = #{like,jdbcType=LONGVARCHAR},
-      unlike = #{unlike,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
   <update id="updateByPrimaryKey" parameterType="club.joylink.rtss.entity.LearnMessage">
     update learn_message
     set post_id = #{postId,jdbcType=BIGINT},
@@ -323,7 +284,10 @@
       picture_urls = #{pictureUrls,jdbcType=VARCHAR},
       creator_id = #{creatorId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      topping = #{topping,jdbcType=BIT}
+      `like` = #{like,jdbcType=INTEGER},
+      unlike = #{unlike,jdbcType=INTEGER},
+      topping = #{topping,jdbcType=TINYINT},
+      user_name = #{userName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

From 081edb053491155d48df902a91b5a966222eddd3 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 4 Mar 2021 21:07:28 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0cgy=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../joylink/rtss/configuration/WebConfig.java |  1 +
 .../rtss/controller/LearnController.java      | 10 ++-
 .../joylink/rtss/services/ILearnService.java  |  5 ++
 .../joylink/rtss/services/LearnService.java   | 67 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/configuration/WebConfig.java b/src/main/java/club/joylink/rtss/configuration/WebConfig.java
index 3ced4ff1b..c10987e73 100644
--- a/src/main/java/club/joylink/rtss/configuration/WebConfig.java
+++ b/src/main/java/club/joylink/rtss/configuration/WebConfig.java
@@ -55,6 +55,7 @@ public class WebConfig implements WebMvcConfigurer {
         whiteList.add("/api/learn/cgy/{messageId}/comment");
         whiteList.add("/api/learn/{postId}/message/pagedQuery/postId");
         whiteList.add("/api/learn/{messageId}/comment");
+        whiteList.add("/api/learn/cgy/updateMessageTime");
         registry.addInterceptor(authenticateInterceptor).excludePathPatterns(whiteList);
     }
 
diff --git a/src/main/java/club/joylink/rtss/controller/LearnController.java b/src/main/java/club/joylink/rtss/controller/LearnController.java
index 982a470f2..1cd923717 100644
--- a/src/main/java/club/joylink/rtss/controller/LearnController.java
+++ b/src/main/java/club/joylink/rtss/controller/LearnController.java
@@ -202,15 +202,21 @@ public class LearnController {
 
     //----------------------------------------- 改数据 -----------------------------------------
     @ApiOperation(value = "管理员修改留言数据")
-    @DeleteMapping(path = "/admin/update/message")
+    @PutMapping(path = "/admin/update/message")
     public void adminUpdateMessage(LearnMessageUpdateVO messageUpdateVO) {
         iLearnService.adminUpdateMessage(messageUpdateVO);
     }
 
     @ApiOperation(value = "管理员修改评论数据")
-    @DeleteMapping(path = "/admin/update/comment")
+    @PutMapping(path = "/admin/update/comment")
     public void adminUpdateComment(LearnCommentUpdateVO commentUpdateVO) {
         iLearnService.adminUpdateComment(commentUpdateVO);
     }
 
+    @ApiOperation(value = "成工院留言时间打散")
+    @PutMapping(path = "/cgy/updateMessageTime")
+    public void cgyUpdateMessageTime() {
+        iLearnService.cgyUpdateMessageTime();
+    }
+
 }
diff --git a/src/main/java/club/joylink/rtss/services/ILearnService.java b/src/main/java/club/joylink/rtss/services/ILearnService.java
index df5b741f9..6c72a0a39 100644
--- a/src/main/java/club/joylink/rtss/services/ILearnService.java
+++ b/src/main/java/club/joylink/rtss/services/ILearnService.java
@@ -146,6 +146,11 @@ public interface ILearnService {
      */
     void adminUpdateComment(LearnCommentUpdateVO commitUpdateVO);
 
+    /**
+     * 成工院留言时间打散
+     */
+    void cgyUpdateMessageTime();
+
 //    /**
 //     * 点赞留言
 //     */
diff --git a/src/main/java/club/joylink/rtss/services/LearnService.java b/src/main/java/club/joylink/rtss/services/LearnService.java
index 3968eded7..e68f735df 100644
--- a/src/main/java/club/joylink/rtss/services/LearnService.java
+++ b/src/main/java/club/joylink/rtss/services/LearnService.java
@@ -32,9 +32,8 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -381,6 +380,68 @@ public class LearnService implements ILearnService {
         learnCommentDAO.updateByPrimaryKey(commentEntity);
     }
 
+//    @Transactional
+//    @Override
+//    public void cgyUpdateMessageTime() {
+//        LearnMessageExample example = new LearnMessageExample();
+//        example.createCriteria().andPostIdEqualTo(27L);
+//        List<LearnMessage> list = learnMessageDAO.selectByExample(example);
+//        int send = 365 * 3 * 24 * 60 * 60;
+//        Random random = new Random();
+//        List<Integer> secondsOffsetList = new ArrayList<>();
+//        for (LearnMessage ignored : list) {
+//            secondsOffsetList.add(random.nextInt(send));
+//        }
+//        secondsOffsetList.sort((i1, i2) -> i2 - i1);
+//        LocalDateTime now = LocalDateTime.now();
+//        for (int i = 0; i < list.size(); i++) {
+//            LearnMessage message = list.get(i);
+//            message.setCreateTime(now.minusSeconds(secondsOffsetList.get(i)));
+//            learnMessageDAO.updateByPrimaryKey(message);
+//        }
+//    }
+
+    @Transactional
+    @Override
+    public void cgyUpdateMessageTime() {
+        LearnMessageExample example = new LearnMessageExample();
+        example.createCriteria().andPostIdEqualTo(27L);
+        List<LearnMessage> allMessage = learnMessageDAO.selectByExample(example);
+        //删重复数据
+        List<LearnMessage> list = allMessage.stream().collect(Collectors.toMap(LearnMessage::getContent, Function.identity(), (old, newValue) -> old))
+                .values().stream().sorted(Comparator.comparingLong(LearnMessage::getId)).collect(Collectors.toList());
+        HashSet<LearnMessage> distinctSet = new HashSet<>(list);
+        List<Long> deleteIds = allMessage.stream().filter(message -> !distinctSet.contains(message)).map(LearnMessage::getId).collect(Collectors.toList());
+        example.clear();
+        example.createCriteria().andIdIn(deleteIds);
+        learnMessageDAO.deleteByExample(example);
+        //修改时间
+        int day = 365 * 3;
+        Random random = new Random();
+        List<Integer> dayOffsetList = new ArrayList<>();
+        for (LearnMessage ignored : list) {
+            dayOffsetList.add(random.nextInt(day));
+        }
+        dayOffsetList.sort((i1, i2) -> i2 - i1);
+        Map<Integer, Long> dayCountMap = dayOffsetList.stream().collect(Collectors.groupingBy(Function.identity(), LinkedHashMap::new, Collectors.counting()));
+        int startIndex = 0;
+        LocalDateTime now = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
+        for (Integer dayOffset : dayCountMap.keySet()) {
+            List<Integer> secondsOffsetList = new ArrayList<>();
+            Long dayCount = dayCountMap.get(dayOffset);
+            for (int i = 0; i < dayCount; i++) {
+                secondsOffsetList.add(random.nextInt(24 * 3600 - 8 * 3600) + 8 * 3600);
+                secondsOffsetList.sort(Integer::compareTo);
+            }
+            for (int i = startIndex; i < startIndex + dayCount; i++) {
+                LearnMessage message = list.get(i);
+                message.setCreateTime(now.minusDays(dayOffset).plusSeconds(secondsOffsetList.get(i - startIndex)));
+                learnMessageDAO.updateByPrimaryKey(message);
+            }
+            startIndex += dayCount;
+        }
+    }
+
     //    @Override
 //    public Integer likeMessage(Long messageId) {
 //        LearnMessageWithBLOBs message = getMessage(messageId);

From 0e934ff3f392f30cc2900bca35c9900c429e62fd Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 4 Mar 2021 21:22:14 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9cgy=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/club/joylink/rtss/services/LearnService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/services/LearnService.java b/src/main/java/club/joylink/rtss/services/LearnService.java
index e68f735df..f7b380e3b 100644
--- a/src/main/java/club/joylink/rtss/services/LearnService.java
+++ b/src/main/java/club/joylink/rtss/services/LearnService.java
@@ -416,7 +416,7 @@ public class LearnService implements ILearnService {
         example.createCriteria().andIdIn(deleteIds);
         learnMessageDAO.deleteByExample(example);
         //修改时间
-        int day = 365 * 3;
+        int day = 365 * 4;
         Random random = new Random();
         List<Integer> dayOffsetList = new ArrayList<>();
         for (LearnMessage ignored : list) {

From 1aa72b87ecd1a7c4951c55d4a5731eb4efcb6107 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 4 Mar 2021 21:27:41 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9cgy=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/club/joylink/rtss/services/LearnService.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/services/LearnService.java b/src/main/java/club/joylink/rtss/services/LearnService.java
index f7b380e3b..4e3b0343c 100644
--- a/src/main/java/club/joylink/rtss/services/LearnService.java
+++ b/src/main/java/club/joylink/rtss/services/LearnService.java
@@ -412,9 +412,11 @@ public class LearnService implements ILearnService {
                 .values().stream().sorted(Comparator.comparingLong(LearnMessage::getId)).collect(Collectors.toList());
         HashSet<LearnMessage> distinctSet = new HashSet<>(list);
         List<Long> deleteIds = allMessage.stream().filter(message -> !distinctSet.contains(message)).map(LearnMessage::getId).collect(Collectors.toList());
-        example.clear();
-        example.createCriteria().andIdIn(deleteIds);
-        learnMessageDAO.deleteByExample(example);
+        if (!CollectionUtils.isEmpty(deleteIds)) {
+            example.clear();
+            example.createCriteria().andIdIn(deleteIds);
+            learnMessageDAO.deleteByExample(example);
+        }
         //修改时间
         int day = 365 * 4;
         Random random = new Random();

From d96b32d88afd8c96b5731e46b25dd97615bc1149 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Wed, 10 Mar 2021 19:40:35 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E6=B3=B0=E9=9B=B7=E5=85=B9=E6=8E=92?=
 =?UTF-8?q?=E5=88=97=E8=BF=9B=E8=B7=AF=E5=88=B0=E6=93=8D=E4=BD=9C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/simulation/SimulationV1Controller.java  |  7 +++----
 .../services/simulation/SimulationSupportService.java  | 10 +++++++---
 .../ATS/operation/handler/TrainOperateHandler.java     |  5 ++---
 .../simulation/cbtc/ATS/service/AtsTrainService.java   |  5 ++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java
index 3a387029d..d1758b8ca 100644
--- a/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java
+++ b/src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java
@@ -11,7 +11,6 @@ import club.joylink.rtss.simulation.cbtc.Simulation;
 import club.joylink.rtss.simulation.cbtc.command.CommandInitiateVO;
 import club.joylink.rtss.simulation.cbtc.communication.vo.fault.DeviceFaultInfo;
 import club.joylink.rtss.simulation.cbtc.data.status.IbpStatus;
-import club.joylink.rtss.simulation.cbtc.data.vo.RoutePathVO;
 import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO;
 import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityIbp;
 import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
@@ -306,9 +305,9 @@ public class SimulationV1Controller {
         return groupSimulationService.getLog(group, queryVO);
     }
 
-    @ApiOperation("查询进路路径")
-    @GetMapping("/{group}/queryRoutePaths")
-    public List<RoutePathVO> queryRoutePaths(@PathVariable String group, String groupNumber, String standCode, String signalCode) {
+    @ApiOperation("查询区段路径")
+    @GetMapping("/{group}/querySectionPaths")
+    public List<List<String>> querySectionPaths(@PathVariable String group, String groupNumber, String standCode, String signalCode) {
         return simulationSupportService.queryRoutePaths(group, groupNumber, standCode, signalCode);
     }
 }
diff --git a/src/main/java/club/joylink/rtss/services/simulation/SimulationSupportService.java b/src/main/java/club/joylink/rtss/services/simulation/SimulationSupportService.java
index 22079e229..a9956d830 100644
--- a/src/main/java/club/joylink/rtss/services/simulation/SimulationSupportService.java
+++ b/src/main/java/club/joylink/rtss/services/simulation/SimulationSupportService.java
@@ -4,17 +4,18 @@ import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
 import club.joylink.rtss.simulation.cbtc.Simulation;
 import club.joylink.rtss.simulation.cbtc.data.CalculateService;
+import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
 import club.joylink.rtss.simulation.cbtc.data.map.Section;
 import club.joylink.rtss.simulation.cbtc.data.map.Signal;
 import club.joylink.rtss.simulation.cbtc.data.map.Stand;
 import club.joylink.rtss.simulation.cbtc.data.support.RoutePath;
-import club.joylink.rtss.simulation.cbtc.data.vo.RoutePathVO;
 import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 仿真运行支持
@@ -24,7 +25,7 @@ public class SimulationSupportService {
     @Autowired
     private GroupSimulationService groupSimulationService;
 
-    public List<RoutePathVO> queryRoutePaths(String group, String groupNumber, String standCode, String signalCode) {
+    public List<List<String>> queryRoutePaths(String group, String groupNumber, String standCode, String signalCode) {
         Simulation simulation = groupSimulationService.getSimulationByGroup(group);
         Section destination;
         if (StringUtils.hasText(standCode)) {
@@ -40,6 +41,9 @@ public class SimulationSupportService {
         Section startSection = train.getHeadPosition().getSection();
 
         List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, destination, train.isRight());
-        return RoutePathVO.convert(routePaths);
+        return routePaths.stream()
+                .map(routePath -> CalculateService.selectUniqueRoutes(routePath, false)
+                        .stream().map(MapElement::getCode).collect(Collectors.toList()))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/TrainOperateHandler.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/TrainOperateHandler.java
index 64b710df2..8edd6be1b 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/TrainOperateHandler.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/TrainOperateHandler.java
@@ -13,7 +13,6 @@ import club.joylink.rtss.simulation.cbtc.data.plan.TripPlan;
 import club.joylink.rtss.simulation.cbtc.data.support.RoutePath;
 import club.joylink.rtss.simulation.cbtc.data.support.SectionPosition;
 import club.joylink.rtss.simulation.cbtc.data.support.TrainLoadParam2;
-import club.joylink.rtss.simulation.cbtc.data.vo.RoutePathVO;
 import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
 import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
 import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
@@ -322,8 +321,8 @@ public class TrainOperateHandler {
      * 排列进路到（站台/信号机）【泰雷兹】
      */
     @OperateHandlerMapping(type = Operation.Type.Train_Set_Route)
-    public void setRouteTo(Simulation simulation, RoutePathVO routePath) {
-        atsTrainService.setRouteTo(simulation, routePath);
+    public void setRouteTo(Simulation simulation, List<String> routes) {
+        atsTrainService.setRouteTo(simulation, routes);
     }
 
     /**
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
index 2dbf1012c..e7e7614c0 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
@@ -13,7 +13,6 @@ import club.joylink.rtss.simulation.cbtc.data.plan.TripPlan;
 import club.joylink.rtss.simulation.cbtc.data.support.RoutePath;
 import club.joylink.rtss.simulation.cbtc.data.support.SectionPosition;
 import club.joylink.rtss.simulation.cbtc.data.support.StationTurnBackStrategyOption;
-import club.joylink.rtss.simulation.cbtc.data.vo.RoutePathVO;
 import club.joylink.rtss.simulation.cbtc.data.vo.TrainInfo;
 import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
 import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
@@ -894,8 +893,8 @@ public class AtsTrainService {
     /**
      * 排列进路到（站台/信号机）
      */
-    public void setRouteTo(Simulation simulation, RoutePathVO routePath) {
-        routePath.getRouteList().forEach(routeCode -> ciApiService.settingRoute(simulation, routeCode));
+    public void setRouteTo(Simulation simulation, List<String> routes) {
+        routes.forEach(code -> ciApiService.settingRoute(simulation, code));
     }
 
     /**

From a415ee4ad33b327b8bb7c8f284415e8dd94f7d50 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Wed, 10 Mar 2021 19:42:20 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=BA=BF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E8=BF=9B=E8=B7=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cbtc/build/InterlockBuilder2.java         | 47 +++++++++++++------
 .../cbtc/data/CalculateService.java           | 43 ++++++++++++++++-
 .../simulation/cbtc/data/map/Section.java     | 12 +++++
 .../cbtc/data/support/MovementAuthority.java  | 18 +++++--
 4 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java b/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
index 07d37c946..2ca0a3c9a 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
@@ -602,15 +602,14 @@ public class InterlockBuilder2 {
                     runPath = new ArrayList<>();
                     routes = new ArrayList<>();
                     //从左端车站开始选择路径
-                    startSection4RoutePath = screeningSection4DestinationCode(leftStation, leftFrontTurnBack, necessarySectionSet, true);
+                    startSection4RoutePath = selectSection4DestinationCode(leftStation, leftFrontTurnBack, necessarySectionSet, true);
                     runPath.add(startSection4RoutePath);
-                    endSection4RoutePath = screeningSection4DestinationCode(rightStation, rightFrontTurnBack, necessarySectionSet, false);
+                    endSection4RoutePath = selectSection4DestinationCode(rightStation, rightFrontTurnBack, necessarySectionSet, false);
                     //查询并添加路径
                     RoutePath optimalPath = CalculateService.queryLeastSwitchRoutePath(startSection4RoutePath, endSection4RoutePath, necessarySectionSet, true);
                     BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(optimalPath,
                             String.format("从%s到%s的路径未找到", startSection4RoutePath.debugStr(), endSection4RoutePath.debugStr()));
                     runPath.addAll(optimalPath.getSectionList());
-                    routes.addAll(optimalPath.getRouteList());
                     //寻找反向的路径
                     Section t = startSection4RoutePath;
                     startSection4RoutePath = endSection4RoutePath;
@@ -620,7 +619,9 @@ public class InterlockBuilder2 {
                     BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(optimalPath2,
                             String.format("从%s到%s的路径未找到", startSection4RoutePath.debugStr(), endSection4RoutePath.debugStr()));
                     runPath.addAll(optimalPath2.getSectionList());
-                    routes.addAll(optimalPath2.getRouteList());
+                    //添加进路
+                    routes.addAll(CalculateService.selectUniqueRoutes(optimalPath, true));
+                    routes.addAll(CalculateService.selectUniqueRoutes(optimalPath2, true));
                     break;
                 }
                 case LAST_OPERATION:
@@ -630,19 +631,37 @@ public class InterlockBuilder2 {
                     if (!StringUtils.hasText(description)) {
                         errMsgList.add(String.format("目的地码[%s]没有描述", code));
                     }
-                    if (startSection == null || right == null) {
-                        errMsgList.add(String.format("单向目的地码[%s]没有起始区段或方向", code));
-                        continue;
-                    }
                     if (section == null) {
                         errMsgList.add(String.format("单向目的地码[%s]没有目标区段", code));
                         continue;
                     }
-                    RoutePath routePath = CalculateService.queryLeastSwitchRoutePath(startSection, section, necessarySections, right);
-                    BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(routePath,
-                            String.format("从%s到%s的路径未找到", startSection.debugStr(), section.debugStr()));
-                    runPath = new ArrayList<>(routePath.getSectionList());
-                    routes = new ArrayList<>(routePath.getRouteList());
+                    if (startSection != null) {
+                        List<Section> sectionPath = new ArrayList<>();
+                        sectionPath.add(startSection);
+                        sectionPath.addAll(necessarySections);
+                        sectionPath.add(section);
+                        runPath = new ArrayList<>();
+                        routes = new ArrayList<>();
+                        for (int i = 0; i < sectionPath.size() - 1; i++) {
+                            Section start = sectionPath.get(i);
+                            Section end = sectionPath.get(i + 1);
+                            RoutePath routePath;
+                            if (right == null) {
+                                routePath = CalculateService.queryLeastSwitchRoutePath(start, end, null, true);
+                                if (routePath == null) {
+                                    routePath = CalculateService.queryLeastSwitchRoutePath(start, end, null, false);
+                                }
+                            } else {
+                                routePath = CalculateService.queryLeastSwitchRoutePath(start, end, null, right);
+                            }
+                            BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(routePath,
+                                    String.format("从%s到%s的路径未找到", startSection.debugStr(), section.debugStr()));
+                            runPath.add(start);
+                            runPath.addAll(routePath.getSectionList());
+                            routes.addAll(routePath.getRouteList());
+                        }
+                        runPath.add(section);
+                    }
                 }
                 case OTHER:
                     if (section == null) {
@@ -665,7 +684,7 @@ public class InterlockBuilder2 {
      * @param preferredSections 优先区段
      * @param right             站前折返时是否优先选择右向站台轨
      */
-    private static Section screeningSection4DestinationCode(Station station, Boolean ftb, Set<Section> preferredSections, boolean right) {
+    private static Section selectSection4DestinationCode(Station station, Boolean ftb, Set<Section> preferredSections, boolean right) {
         Section section;
         if (ftb) {
             Optional<Section> selectedSectionOptional = preferredSections.stream()
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
index 2f95cf0e4..aa16dfce0 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
@@ -691,7 +691,7 @@ public class CalculateService {
                 }
                 return optimalPath;
             }
-            return routePaths.stream().min(Comparator.comparingDouble(RoutePath::getLength)).orElse(null);
+            return routePaths.stream().min(Comparator.comparingInt(RoutePath::getSwitchQuantity)).orElse(null);
         }
     }
 
@@ -1157,6 +1157,46 @@ public class CalculateService {
         return atoSpeed;
     }
 
+    /**
+     * 筛选唯一进路。
+     * 进路路径的sectionList中可能包含同一信号机下的多个进路，本方法将筛选掉多余的进路
+     *
+     * @param routePath
+     * @param tb        是否要在进路路径的终点区段折返
+     * @return
+     */
+    public static List<Route> selectUniqueRoutes(RoutePath routePath, boolean tb) {
+        List<Route> routes = new ArrayList<>();
+        List<Route> routeList = routePath.getRouteList();
+        List<Section> runPath = new ArrayList<>();
+        runPath.add(routePath.getStart());
+        runPath.addAll(routePath.getSectionList());
+        runPath.add(routePath.getEnd());
+        for (int i = 0; i < routeList.size(); i++) {
+            Route route = routeList.get(i);
+            Route last = i > 0 ? routeList.get(i - 1) : null;
+            if (last == null) {
+                routes.add(route);
+            } else {
+                if (last.getStart().equals(route.getStart())) {
+                    if (last.getLastRouteSection().equals(routePath.getEnd())) { //进路到达目的地折返轨，优先选择折返进路
+                        if (!Objects.equals(tb, last.isTurnBack())) {
+                            routes.set(routes.size() - 1, route);
+                        }
+                    } else { //优先选择非折返且无延续保护或延续保护在路径上的
+                        if (last.isTurnBack() ||
+                                (last.getOverlap() != null && !runPath.containsAll(last.getOverlap().getPathList().get(0).getSectionList()))) {
+                            routes.set(routes.size() - 1, route);
+                        }
+                    }
+                } else {
+                    routes.add(route);
+                }
+            }
+        }
+        return routes;
+    }
+
     /**
      * 计算加速段的时间
      */
@@ -1195,4 +1235,5 @@ public class CalculateService {
         return acceleratedDistance + varyingAcceleratedDistance;
     }
 
+
 }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
index 280c1b311..5d2c70be7 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
@@ -1046,6 +1046,18 @@ public class Section extends MayOutOfOrderDevice {
                 section.setCtOccupied(true);
                 return true;
             }
+
+            @Override
+            public void fix(MayOutOfOrderDevice device) {
+                if (this.equals(device.getFault())) {
+                    Section section = (Section) device;
+                    section.setCtOccupied(false);
+                    section.setFault(null);
+                    if (section.isSwitchTrack()) {
+                        section.getRelSwitch().getAllSections().forEach(section1 -> section1.setCtOccupied(false));
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/support/MovementAuthority.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/support/MovementAuthority.java
index 69a615ab8..44a6ff3d7 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/support/MovementAuthority.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/support/MovementAuthority.java
@@ -48,6 +48,14 @@ public class MovementAuthority {
                 end.getEndPosition());
     }
 
+    @Override
+    public String toString() {
+        return "MovementAuthority{" +
+                "end=" + end +
+                ", protectSpeedCurve=" + protectSpeedCurve +
+                '}';
+    }
+
     @Getter
     public static class End {
         MapNamedElement device;
@@ -75,10 +83,12 @@ public class MovementAuthority {
 
         @Override
         public String toString() {
-            return String.format("End{" +
-                    "device=[%s(%s)]" +
-                    ", type=[%s]" +
-                    '}', this.device.getName(), this.device.getCode(), this.type);
+            return "End{" +
+                    "device=" + device +
+                    ", type=" + type +
+                    ", baseSection=" + baseSection +
+                    ", endPosition=" + endPosition +
+                    '}';
         }
 
         private SectionPosition computeEndPosition(boolean right) {

From 397d6d9c3b6f255677e6f55bfba03a16fc9bce37 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Mon, 15 Mar 2021 10:39:10 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/club/joylink/rtss/configuration/WebConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/configuration/WebConfig.java b/src/main/java/club/joylink/rtss/configuration/WebConfig.java
index 8d16d641e..3c90b176c 100644
--- a/src/main/java/club/joylink/rtss/configuration/WebConfig.java
+++ b/src/main/java/club/joylink/rtss/configuration/WebConfig.java
@@ -54,7 +54,7 @@ public class WebConfig implements WebMvcConfigurer {
         whiteList.add("/api/learn/cgy/message/create");
         whiteList.add("/api/learn/cgy/{messageId}/comment");
         whiteList.add("/api/learn/{postId}/message/pagedQuery/postId");
-        whiteList.add("/api/learn/{messageId}/comment");
+        whiteList.add("GET /api/learn/{messageId}/comment");
         whiteList.add("/api/learn/cgy/updateMessageTime");
         // 成都工业使用记录
         whiteList.add("/api/cgy/**");

From f53cfefb8c4f75ef92b9763c4262a54cbfcfa8d9 Mon Sep 17 00:00:00 2001
From: DU <dukang@163.com>
Date: Thu, 25 Mar 2021 18:18:38 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runplan/RunPlanDraftController.java       |   6 +-
 .../rtss/services/RunPlanDraftService.java    |  37 ++++++-
 .../runplan/IRunPlanRoutingService.java       |   2 +-
 .../services/runplan/RunPlanGenerator.java    | 103 +++++++++++++++---
 .../runplan/RunPlanRoutingService.java        |  14 +--
 .../vo/client/runplan/RunPlanTripTimeVO.java  |   1 +
 .../client/runplan/user/RunPlanRoutingVO.java |   6 +-
 7 files changed, 134 insertions(+), 35 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java
index 73d52ff47..719f9fa6a 100644
--- a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java
+++ b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java
@@ -164,9 +164,9 @@ public class RunPlanDraftController {
     }
 
     @ApiOperation(value = "根据用户交路查询交路区段列表")
-    @GetMapping(path = "/{planId}/{routingCode}/userRoutingSectionList")
-    public List<RunPlanRoutingSection> getRoutingSectionList(@PathVariable Long planId, @PathVariable String routingCode, @ApiIgnore @RequestAttribute UserVO user) {
-        return this.iRunPlanRoutingService.getRoutingSectionDataBy(user.getId() , planId, routingCode);
+    @GetMapping(path = "/{routingCode}/routingSectionList")
+    public List<RunPlanRoutingSection> getRoutingSectionList( @PathVariable Long routingCode, @ApiIgnore @RequestAttribute UserVO user) {
+        return this.iRunPlanRoutingService.getRoutingSectionDataBy(user.getId() , routingCode);
     }
 
     @ApiOperation(value = "增加计划")
diff --git a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java
index 604a9bf4b..dd8b2659f 100644
--- a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java
+++ b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java
@@ -791,11 +791,38 @@ public class RunPlanDraftService implements IRunPlanDraftService {
             errorList.add("运行图数据为空！");
             return errorList;
         }
-        //	• 找到每个服务发车时间，查找发车时间不能过早 结束时间不能过晚
-        //	• 同一服务 根据发车排序每个车次，往后每个时刻应该晚于上个且时刻之间时间应该根据站间运行等级距离计算最小值。
-        //	• 不同服务发车间隔>=1分45秒
-        //	• 同站车次间隔时间：不能过小 根据最大最小速度计算 站间距离
-        //  • 折返时间
+
+//        Map<String, List<RunPlanImport>> serviceNumberMap = runPlanImportList.stream()
+//                .collect(Collectors.groupingBy(RunPlanImport::getServiceNumber, LinkedHashMap::new, Collectors.toList()));
+//        serviceNumberMap.forEach((serviceNumber, importList) -> {
+//            // 排序
+//            importList.sort(Comparator.comparing(runPlanImport -> runPlanImport.getArrivalList().get(0).getArriveTime()));
+//
+
+        /*	• 找到每个服务发车时间，查找发车时间不能过早 结束时间不能过晚
+         1 所有服务所有发车时间验证
+         2 不同服务同一站同向发车间隔验证>=1分45秒
+        */
+        Map<String, List<RunPlanTripVO>> serviceMap = planVO.getTripList().stream().collect(Collectors.groupingBy(RunPlanTripVO::getServiceNumber));
+        serviceMap.forEach((s, runPlanTripVOS) -> {
+            runPlanTripVOS.forEach(runPlanTripVO -> {
+                List<RunPlanTripTimeVO> timeList = runPlanTripVO.getTimeList();
+                if (CollectionUtils.isEmpty(timeList)) {
+                    errorList.add(String.format("服务号[%s]车次号[%s]没有到站时刻数据", s, runPlanTripVO.getTripNumber()));
+                    return;
+                }
+
+
+            });
+        });
+
+        /*• 同一服务 根据发车排序每个车次，往后每个时刻应该晚于上个且时刻之间时间应该根据站间运行等级距离计算最小值。
+         * 1 同一服务 每个车次 每个时刻停站时间 运行间隔  车次到下一车次是否衔接  折返时间
+         * */
+
+
+        //	• 同站相邻车次间隔时间：不能过小 根据最大最小速度计算 站间距离
+
 
         MapVO map = this.iMapService.getMapDetail(planVO.getMapId());
         SimulationBuilder.SimulationDeviceBuildResult buildResult = SimulationBuilder.checkAndBuildMapData(map);
diff --git a/src/main/java/club/joylink/rtss/services/runplan/IRunPlanRoutingService.java b/src/main/java/club/joylink/rtss/services/runplan/IRunPlanRoutingService.java
index 53992d9e1..bb4887fc8 100644
--- a/src/main/java/club/joylink/rtss/services/runplan/IRunPlanRoutingService.java
+++ b/src/main/java/club/joylink/rtss/services/runplan/IRunPlanRoutingService.java
@@ -32,7 +32,7 @@ public interface IRunPlanRoutingService {
 
     RunPlanRoutingVO queryUserRoutingById(Long userId, Long mapId, Long routingId);
 
-    List<RunPlanRoutingSection> getRoutingSectionDataBy(Long userId, Long planId, String routingCode);
+    List<RunPlanRoutingSection> getRoutingSectionDataBy(Long userId,Long routingId);
 
     @Transactional
     void createDefaultRoutings(List<RunPlanRoutingVO> defaultRoutings);
diff --git a/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java b/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java
index 8c974647e..36da9071a 100644
--- a/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java
+++ b/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java
@@ -56,12 +56,12 @@ public class RunPlanGenerator {
             List<RunPlanRoutingVO> outboundRoutings = runPlanRoutingService.getUserRoutingByType(userId, mapVO.getId(), RunPlanRoutingVO.UserRoutingType.OUTBOUND);
             inboundRoutings = runPlanRoutingService.getUserRoutingByType(userId, mapVO.getId(), RunPlanRoutingVO.UserRoutingType.INBOUND);
             outboundRouting1 = outboundRoutings.stream().filter(outRouting ->
-                    Objects.equals(outRouting.getEndSectionCode(), running1Routing.getStartSectionCode()) && !Objects.equals(outRouting.getRight(), running1Routing.getRight()))
+                    Objects.equals(outRouting.getEndSectionCode(), running1Routing.getStartSectionCode()) /*|| outRouting.getParkSectionCodeList().contains(running1Routing.getParkSectionCodeList().get(1))*/ /*&& !Objects.equals(outRouting.getRight(), running1Routing.getRight())*/)
                     .sorted(Comparator.comparingInt(o -> o.getParkSectionCodeList().indexOf(running1Routing.getParkSectionCodeList().get(0))))
                     .findFirst().orElse(null);
 
             outboundRouting2 = outboundRoutings.stream().filter(outRouting ->
-                    Objects.equals(outRouting.getEndSectionCode(), running2Routing.getStartSectionCode()) && !Objects.equals(outRouting.getRight(), running2Routing.getRight()))
+                    Objects.equals(outRouting.getEndSectionCode(), running2Routing.getStartSectionCode()) /*|| outRouting.getParkSectionCodeList().contains(running2Routing.getParkSectionCodeList().get(1))*/  /*&& !Objects.equals(outRouting.getRight(), running2Routing.getRight())*/)
                     .sorted(Comparator.comparingInt(o -> o.getParkSectionCodeList().indexOf(running2Routing.getParkSectionCodeList().get(0))))
                     .findFirst().orElse(null);
             BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotTrue(Objects.isNull(outboundRouting1) && Objects.isNull(outboundRouting2), "没有找到对应的出库交路");
@@ -132,27 +132,41 @@ public class RunPlanGenerator {
     }
 
     private LocalTime getDepartEndTime(RunPlanInputData inputData, LinkedList<RunPlanTripVO> serviceTripList) {
-        LocalTime departEndTime;
         List<RunPlanTripTimeVO> outBoundTimeList = serviceTripList.getFirst().getTimeList();
+        boolean second=false;
+        if(outBoundTimeList.size()==1){
+            second =true;
+            outBoundTimeList = serviceTripList.get(1).getTimeList();
+        }
         RunPlanTripTimeVO tripTime = null;
-        LocalTime overTime = null;
-        k:
+        a:
         for (int f = 1; f < outBoundTimeList.size(); f++) {
-            tripTime = outBoundTimeList.get(f);
-            for (int i = 0; i < serviceTripList.size(); i += 2) {
+            for (RunPlanTripTimeVO runPlanTripTimeVO : serviceTripList.get(1).getTimeList()) {
+                if (outBoundTimeList.get(f).getStationCode().equals(runPlanTripTimeVO.getStationCode())) {
+                    tripTime = outBoundTimeList.get(f);
+                    break a;
+                }
+            }
+        }
+
+        LocalTime overTime = null;
+        if (Objects.nonNull(tripTime)) {
+            h:
+            for (int i = second ? 1 : 0; i < serviceTripList.size(); i += 2) {
                 List<RunPlanTripTimeVO> secondTimeList = serviceTripList.get(i).getTimeList();
                 for (RunPlanTripTimeVO runPlanTripTimeVO : secondTimeList) {
                     if (Objects.equals(runPlanTripTimeVO.getStationCode(), tripTime.getStationCode())) {
                         if (runPlanTripTimeVO.getArrivalTime().isAfter(tripTime.getArrivalTime())) {
                             overTime = runPlanTripTimeVO.getArrivalTime();
-                            break k;
+                            break h;
                         }
                         break;
                     }
                 }
             }
         }
-        departEndTime = Objects.nonNull(overTime) ? overTime.minusSeconds(ChronoUnit.SECONDS.between(inputData.getBeginTime(), tripTime.getArrivalTime())) : LocalTime.of(12, 0);
+
+        LocalTime departEndTime = Objects.nonNull(overTime) ? overTime.minusSeconds(ChronoUnit.SECONDS.between(inputData.getBeginTime(), tripTime.getArrivalTime())) : LocalTime.of(12, 0);
         return departEndTime;
     }
 
@@ -177,14 +191,60 @@ public class RunPlanGenerator {
         }
     }
 
-    private DepartEndTime getDepartEndTime(RunPlanInputData inputData, LinkedList<RunPlanTripVO> serviceTripList1, LinkedList<RunPlanTripVO> serviceTripList2) {
+    private DepartEndTime getDepartEndTime(RunPlanInputData inputData,
+                                           LinkedList<RunPlanTripVO> serviceTripList1, LinkedList<RunPlanTripVO> serviceTripList2) {
+
+        RunPlanTripVO firsttrip1 = serviceTripList1.getFirst();
+        RunPlanTripVO secondtrip1 = serviceTripList1.get(1);
+        boolean out1 = firsttrip1.getRight().equals(secondtrip1.getRight());
+        RunPlanTripVO firsttrip2 = serviceTripList2.getFirst();
+        RunPlanTripVO secondtrip2 = serviceTripList2.get(1);
+        boolean out2 = firsttrip2.getRight().equals(secondtrip2.getRight());
+        boolean same = firsttrip1.getRight().equals(firsttrip2.getRight());
 
         Long interval1 = null;
         LocalTime time11 = null;
         LocalTime time12 = null;
         RunPlanTripTimeVO collisionTripTime1 = null;
-        List<RunPlanTripTimeVO> firstTimeListOf1 = serviceTripList1.getFirst().getTimeList();
-        List<RunPlanTripTimeVO> secondTimeListOf2 = serviceTripList2.get(1).getTimeList();
+
+        int index1=0,index2 = 1;
+        if(same){
+            if(out1){
+                index1=1;
+                index2=index1+1;
+            }else if(out2){
+                index1=0;
+                index2=index1+1;
+            }else{
+                index1 = 0;
+                index2=index1+2;
+            }
+
+        }else{
+            if(out1 && out2){
+                index1 = 1;
+                index2 = 2;
+            }else if(out1){
+                index1 = 1;
+                index2 = 1;
+            }else if(out2){
+                index1 = 0;
+                index2 = 2;
+            }
+
+        }
+
+
+//        List<RunPlanTripTimeVO> firstTimeListOf1 = serviceTripList1.getFirst().getTimeList();
+        List<RunPlanTripTimeVO> firstTimeListOf1 = serviceTripList1.get(index1).getTimeList();
+        List<RunPlanTripTimeVO> secondTimeListOf2 = serviceTripList2.get(index2).getTimeList();
+        if(index1 ==0 && firstTimeListOf1.size()==1){
+            firstTimeListOf1 = serviceTripList1.get(index1+1).getTimeList();
+            if(out2){
+                secondTimeListOf2 =  serviceTripList2.get(index2==2?index2:index2+1).getTimeList();
+            }
+        }
+
 
         k:
         for (int i = 1; i < firstTimeListOf1.size(); i++) {
@@ -203,8 +263,16 @@ public class RunPlanGenerator {
         LocalTime time22 = null;
         LocalTime time21 = null;
         RunPlanTripTimeVO collisionTripTime2 = null;
-        List<RunPlanTripTimeVO> firstTimeListOf2 = serviceTripList2.getFirst().getTimeList();
-        List<RunPlanTripTimeVO> secondTimeListOf1 = serviceTripList1.get(1).getTimeList();
+//        List<RunPlanTripTimeVO> firstTimeListOf2 = serviceTripList2.getFirst().getTimeList();
+//        List<RunPlanTripTimeVO> secondTimeListOf1 = serviceTripList1.get(1).getTimeList();
+        List<RunPlanTripTimeVO> firstTimeListOf2 = serviceTripList2.get(index1).getTimeList();
+        List<RunPlanTripTimeVO> secondTimeListOf1 = serviceTripList1.get(index2).getTimeList();
+        if (index1 == 0 && firstTimeListOf2.size() == 1) {
+            firstTimeListOf2 = serviceTripList2.get(index1 + 1).getTimeList();
+            if (out2) {
+                secondTimeListOf1 = serviceTripList1.get(index2 == 2 ? index2 : index2 + 1).getTimeList();
+            }
+        }
 
         k:
         for (int i = 1; i < firstTimeListOf2.size(); i++) {
@@ -478,6 +546,7 @@ public class RunPlanGenerator {
             tripVO.setIsInbound(true);
             tripVO.setIsReentry(false);
         }
+        Boolean startTBIsFront = startTBIsFront(routing, mapVO);
         LinkedList<RunPlanTripTimeVO> tripTimeList = new LinkedList<>();
         int size = routing.getParkSectionCodeList().size();
         for (int i = 0; i < size; i++) {
@@ -486,10 +555,13 @@ public class RunPlanGenerator {
             runPlanTripTimeVO.setStationCode(routingSection.getStationCode());
             runPlanTripTimeVO.setSectionCode(routingSection.getSectionCode());
             if (CollectionUtils.isEmpty(tripList) && i == 0) {//首发车次
+                if (Objects.nonNull(startTBIsFront) && !startTBIsFront) {
+                    continue;
+                }
                 runPlanTripTimeVO.setArrivalTime(inputData.getBeginTime());
                 runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime());
             } else if (i == 0) { //其它车次发车
-                if (!startTBIsFront(routing, mapVO)) {
+                if (!startTBIsFront) {
                     continue;
                 }
                 RunPlanUserConfigVO.ReentryTime reentryTime = reentryData.get(routingSection.getStationCode());
@@ -507,7 +579,6 @@ public class RunPlanGenerator {
                         ? runPlanTripTimeVO.getArrivalTime()
                         : runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
             } else {
-                Boolean startTBIsFront = startTBIsFront(routing, mapVO);
                 if (i == 1 && Objects.nonNull(startTBIsFront) && !startTBIsFront) {
                     RunPlanUserConfigVO.ReentryTime reentryTime = reentryData.get(routing.getStartStationCode());
                     runPlanTripTimeVO.setArrivalTime(CollectionUtils.isEmpty(tripList) ? inputData.getBeginTime() : tripList.getLast().getEndTime().plusSeconds(reentryTime.getTbBack() - reentryTime.getTbFrom()));
diff --git a/src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java b/src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java
index e1f5b479b..2b8992af2 100644
--- a/src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java
+++ b/src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java
@@ -365,7 +365,7 @@ public class RunPlanRoutingService implements IRunPlanRoutingService {
         RunPlanRoutingExample example = new RunPlanRoutingExample();
         example.createCriteria().andMapIdEqualTo(mapId).andUserIdEqualTo(userId);
         example.or().andMapIdEqualTo(mapId).andUserIdIsNull();
-        List<RunPlanRouting> runPlanRoutings = runPlanRoutingDAO.selectByExampleWithBLOBs(example);
+        List<RunPlanRouting> runPlanRoutings = runPlanRoutingDAO.selectByExample(example);
         return RunPlanRoutingVO.convert2VOList(runPlanRoutings,this.iMapService.getMapDetail(mapId));
     }
 
@@ -400,14 +400,10 @@ public class RunPlanRoutingService implements IRunPlanRoutingService {
     }
 
     @Override
-    public List<RunPlanRoutingSection> getRoutingSectionDataBy(Long userId, Long planId, String routingCode) {
-        RunPlanDraft runPlanDraft = runPlanDraftDAO.selectByPrimaryKey(planId);
-        RunPlanRoutingExample example = new RunPlanRoutingExample();
-        example.createCriteria().andMapIdEqualTo(runPlanDraft.getMapId()).andUserIdEqualTo(userId).andCodeEqualTo(routingCode);
-        example.or().andMapIdEqualTo(runPlanDraft.getMapId()).andUserIdIsNull().andCodeEqualTo(routingCode);
-        List<RunPlanRouting> list = runPlanRoutingDAO.selectByExampleWithBLOBs(example);
-        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
-        return RunPlanRoutingVO.convert2VO(list.get(0)).getParkSectionCodeList();
+    public List<RunPlanRoutingSection> getRoutingSectionDataBy(Long userId, Long routingId) {
+        RunPlanRouting routing = runPlanRoutingDAO.selectByPrimaryKey(routingId);
+        if (Objects.isNull(routing)) return Collections.emptyList();
+        return RunPlanRoutingVO.convert2VO(routing).getParkSectionCodeList();
     }
 
 
diff --git a/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripTimeVO.java b/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripTimeVO.java
index a0682ef00..a330b2b4f 100644
--- a/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripTimeVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripTimeVO.java
@@ -73,4 +73,5 @@ public class RunPlanTripTimeVO {
         this.arrivalTime = plan.getArriveTime();
         this.departureTime = plan.getLeaveTime();
     }
+
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java
index fcff8b60d..3393beecb 100644
--- a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java
@@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -116,7 +118,9 @@ public class RunPlanRoutingVO {
         routingVO.setRight(runPlanRouting.getRight());
         routingVO.setDestinationCode(runPlanRouting.getDestinationCode());
         routingVO.setRemarks(runPlanRouting.getRemarks());
-        routingVO.setParkSectionCodeList(JsonUtils.readCollection(runPlanRouting.getSectionData(), List.class, RunPlanRoutingSection.class));
+        if(StringUtils.hasText(runPlanRouting.getSectionData())){
+            routingVO.setParkSectionCodeList(JsonUtils.readCollection(runPlanRouting.getSectionData(), List.class, RunPlanRoutingSection.class));
+        }
         routingVO.setReentryType(mapVO);
         return routingVO;
     }

From 8383ec0336c5843443c758431e50dde84d0271b1 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 25 Mar 2021 19:06:08 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E6=95=99=E5=AD=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/controller/OrgController.java        | 10 ++--
 .../rtss/dao/UserTrainingStatsMapper.java     |  2 +-
 .../joylink/rtss/services/ExamService.java    |  2 +-
 .../joylink/rtss/services/LessonService.java  | 24 +++++----
 .../rtss/services/MapSystemService.java       | 54 ++++++++++---------
 .../rtss/services/org/IOrgLessonService.java  |  8 +--
 .../rtss/services/org/OrgLessonService.java   | 30 ++++++++---
 .../joylink/rtss/services/org/OrgService.java | 10 ++--
 .../rtss/vo/client/LessonPublishVO.java       |  5 ++
 .../rtss/vo/client/org/OrgQueryVO.java        |  2 +-
 10 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/controller/OrgController.java b/src/main/java/club/joylink/rtss/controller/OrgController.java
index dfa05024e..22103d485 100644
--- a/src/main/java/club/joylink/rtss/controller/OrgController.java
+++ b/src/main/java/club/joylink/rtss/controller/OrgController.java
@@ -159,16 +159,16 @@ public class OrgController {
         return iOrgUserService.getUserCompanyDeparts(user, companyId);
     }
 
-    @ApiOperation("查询组织（班级）的课程")
+    @ApiOperation("查询自己给该组织（班级）排的课")
     @GetMapping("/orgLesson/{orgId}/list")
-    public List<LessonVO> queryOrgLesson(@PathVariable Long orgId) {
-        return iOrgLessonService.queryOrgLesson(orgId);
+    public List<LessonVO> queryOrgLessonICreated(@PathVariable Long orgId, @RequestAttribute UserVO user) {
+        return iOrgLessonService.queryOrgLessonICreated(orgId, user);
     }
 
     @ApiOperation("修改班级-课程关系")
     @PutMapping("/orgLesson/{clsId}/update")
-    public void updateOrgLesson(@PathVariable Long clsId, @RequestBody List<Long> lessonIds, @RequestAttribute UserVO user) {
-        iOrgLessonService.updateOrgLesson(clsId, lessonIds, user);
+    public void updateOrgLesson(@PathVariable Long clsId, @RequestBody List<Long> lessonIds, @RequestAttribute LoginUserInfoVO loginInfo) {
+        iOrgLessonService.updateOrgLesson(clsId, lessonIds, loginInfo);
     }
 
     @ApiOperation("给班级添加学生")
diff --git a/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java b/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java
index 59c4b43ea..74c1969b9 100644
--- a/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java
+++ b/src/main/java/club/joylink/rtss/dao/UserTrainingStatsMapper.java
@@ -67,7 +67,7 @@ public interface UserTrainingStatsMapper {
             "ut.user_id AS userId " +
             "FROM user_training_stats ut " +
             "LEFT JOIN sys_user u ON u.id = ut.user_id " +
-            "WHERE u.id = #{userId} AND finishTime &gt; #{startTime} AND finishTime &lt; #{endTime} " +
+            "WHERE u.id = #{userId} AND finishTime &gt;= #{startTime} AND finishTime &lt;= #{endTime} " +
             "AND ut.lesson_id IN" +
             "<foreach collection='lessonIds' item='lessonId' open='(' separator=',' close=')'>" +
             "#{lessonId}" +
diff --git a/src/main/java/club/joylink/rtss/services/ExamService.java b/src/main/java/club/joylink/rtss/services/ExamService.java
index 69a318678..ba07b304a 100644
--- a/src/main/java/club/joylink/rtss/services/ExamService.java
+++ b/src/main/java/club/joylink/rtss/services/ExamService.java
@@ -647,7 +647,7 @@ public class ExamService implements IExamService {
             List<Long> clsIds = clsList.stream().map(Org::getId).collect(Collectors.toList());
             lessonIds =  iOrgLessonService.findEntitiesByOrgIds(clsIds).stream().map(OrgLesson::getLessonId).collect(Collectors.toList());
         } else {
-            lessonIds = iOrgLessonService.findEntitiesByOrgId(clsId).stream().map(OrgLesson::getLessonId).collect(Collectors.toList());
+            lessonIds = iOrgLessonService.findEntitiesByOrgId(clsId, null).stream().map(OrgLesson::getLessonId).collect(Collectors.toList());
         }
         return findEntityByLessonIdList(lessonIds).stream()
                 .filter(exam -> loginInfo.getUserVO().getId().equals(exam.getCreatorId()))
diff --git a/src/main/java/club/joylink/rtss/services/LessonService.java b/src/main/java/club/joylink/rtss/services/LessonService.java
index 78537ed0f..268cc4cc6 100644
--- a/src/main/java/club/joylink/rtss/services/LessonService.java
+++ b/src/main/java/club/joylink/rtss/services/LessonService.java
@@ -222,7 +222,8 @@ public class LessonService implements ILessonService {
 //            MapVO mapVO = iMapService.findMapBaseInfoById(publishVO.getMapId());
 //            BusinessConsts.Lesson.PrdInfo prdInfo = BusinessConsts.Lesson.PrdInfo.getBy(publishVO.getPrdType());
 //            String defaultLessonName = String.join("-", mapVO.getName(), prdInfo.getName());
-
+            BusinessExceptionAssertEnum.DATA_UNIQUE_PROPERTY_REPEAT.assertTrue(publishVO.isCoverSameNameLesson(),
+                    "与已有课程同名，请修改名称");
             LessonVO sysFaultLesson = findSysFaultByMapAndPrdType(publishVO.getMapId(), publishVO.getPrdType());
             if (sysFaultLesson != null) {
                 BusinessExceptionAssertEnum.INVALID_OPERATION.assertNotTrue(Objects.equals(publishVO.getName(), sysFaultLesson.getName()), "与系统默认课程重名，请修改名称");
@@ -387,13 +388,17 @@ public class LessonService implements ILessonService {
 
     @Override
     public List<LessonVO> queryByIds(List<Long> lessonIds, String status) {
-        LsLessonExample lessonExample = new LsLessonExample();
-        Criteria criteria = lessonExample.createCriteria().andIdIn(lessonIds);
-        if (StringUtils.hasText(status)) {
-            criteria.andStatusEqualTo(status);
+        if (CollectionUtils.isEmpty(lessonIds)) {
+            return new ArrayList<>();
+        } else {
+            LsLessonExample lessonExample = new LsLessonExample();
+            Criteria criteria = lessonExample.createCriteria().andIdIn(lessonIds);
+            if (StringUtils.hasText(status)) {
+                criteria.andStatusEqualTo(status);
+            }
+            List<LsLesson> lessonList = this.lessonDAO.selectByExample(lessonExample);
+            return LessonVO.convert(lessonList);
         }
-        List<LsLesson> lessonList = this.lessonDAO.selectByExample(lessonExample);
-        return LessonVO.convert(lessonList);
     }
 
     @Override
@@ -567,7 +572,7 @@ public class LessonService implements ILessonService {
             List<Long> mapIds = maps.stream().map(MapVO::getId).collect(Collectors.toList());
             LsLessonExample example = new LsLessonExample();
             Criteria criteria = example.createCriteria();
-            criteria.andMapIdIn(mapIds).andSysfaultEqualTo(false);
+            criteria.andMapIdIn(mapIds).andSysfaultEqualTo(false).andStatusEqualTo(BusinessConsts.STATUS_USE);
             if (queryVO.isSelf()) {
                 criteria.andCreatorIdEqualTo(loginInfo.getUserVO().getId());
             }
@@ -594,7 +599,7 @@ public class LessonService implements ILessonService {
 
     @Override
     public List<LessonVO> queryOrgLessonOfSelf(Long clsId, LoginUserInfoVO loginInfo) {
-        List<Long> lessonIds = iOrgLessonService.findEntitiesByOrgId(clsId).stream().map(OrgLesson::getLessonId).collect(Collectors.toList());
+        List<Long> lessonIds = iOrgLessonService.findEntitiesByOrgId(clsId, null).stream().map(OrgLesson::getLessonId).collect(Collectors.toList());
         List<LsLesson> lessonEntities = findLessonEntities(lessonIds);
         return lessonEntities.stream()
                 .filter(lesson -> loginInfo.getUserVO().getId().equals(lesson.getCreatorId())).map(LessonVO::new).collect(Collectors.toList());
@@ -610,6 +615,7 @@ public class LessonService implements ILessonService {
             LsLessonExample example = new LsLessonExample();
             Criteria criteria = example.createCriteria()
                     .andMapIdIn(mapIds)
+                    .andStatusEqualTo(BusinessConsts.STATUS_USE)
                     .andSysfaultEqualTo(false);
             if (creatorId != null) {
                 criteria.andCreatorIdEqualTo(creatorId);
diff --git a/src/main/java/club/joylink/rtss/services/MapSystemService.java b/src/main/java/club/joylink/rtss/services/MapSystemService.java
index 801288f54..ea328652c 100644
--- a/src/main/java/club/joylink/rtss/services/MapSystemService.java
+++ b/src/main/java/club/joylink/rtss/services/MapSystemService.java
@@ -1,8 +1,12 @@
 package club.joylink.rtss.services;
 
-import club.joylink.rtss.constants.*;
+import club.joylink.rtss.constants.MapPrdTypeEnum;
+import club.joylink.rtss.constants.MapSystemType;
+import club.joylink.rtss.constants.Project;
+import club.joylink.rtss.constants.StatusEnum;
 import club.joylink.rtss.dao.MapSystemDAO;
-import club.joylink.rtss.entity.*;
+import club.joylink.rtss.entity.MapSystem;
+import club.joylink.rtss.entity.MapSystemExample;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.services.org.IOrgLessonService;
 import club.joylink.rtss.services.org.IOrgService;
@@ -27,10 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -221,30 +223,30 @@ public class MapSystemService implements IMapSystemService {
 
             mapSystemDetailVO.setPermissionList(permissionVOList);
         } else if (MapSystemType.Lesson.name().equals(mapSystem.getType()) || MapSystemType.Exam.name().equals(mapSystem.getType())) {
-            Org topOrg = iOrgService.findEntity(loginInfo.getProject(), BusinessConsts.Org.Status.VALID);
+//            Org topOrg = iOrgService.findEntity(loginInfo.getProject(), BusinessConsts.Org.Status.VALID);
             List<LessonVO> lessonVOList;
-            if (!Project.CGY.equals(loginInfo.getProject()) && topOrg != null) { //由于成都工业的特殊性，先防一下
-                lessonVOList = new ArrayList<>();
-                LessonVO defaultLesson = iLessonService.findSysFaultByMapAndPrdType(mapSystem.getMapId(), mapSystem.getPrdType());
-                if (defaultLesson != null && MapStatus.Online.getCode().equals(defaultLesson.getStatus())) {
-                    lessonVOList.add(defaultLesson);
-                }
-                List<LessonVO> lessonsICreated = iLessonService.queryNonDefaultLessons(loginInfo.getUserVO().getId(),
-                        loginInfo.getProject(), BusinessConsts.STATUS_USE);
-                lessonVOList.addAll(lessonsICreated);
-                //如果当前用户有所属班级，查询所属有效班级关联的有效课程
-                List<OrgUser> orgUsers = iOrgUserService.findEntities(loginInfo.getUserVO().getId(), null);
-                List<Long> orgIds = orgUsers.stream().map(OrgUser::getOrgId).collect(Collectors.toList());
-                List<Long> validOrgIds = iOrgService.findEntities(orgIds, BusinessConsts.Org.Status.VALID)
-                        .stream().map(Org::getId).collect(Collectors.toList());
-                Set<Long> lessonIdSet = lessonVOList.stream().map(LessonVO::getId).collect(Collectors.toSet());
-                List<Long> orgLessonIds = iOrgLessonService.findEntitiesByOrgIds(validOrgIds).stream().map(OrgLesson::getLessonId)
-                        .filter(lessonId -> !lessonIdSet.contains(lessonId)).distinct().collect(Collectors.toList());
-                lessonVOList.addAll(iLessonService.queryByIds(orgLessonIds, BusinessConsts.STATUS_USE));
-                //
-            } else {
+//            if (!Project.CGY.equals(loginInfo.getProject()) && topOrg != null) { //由于成都工业的特殊性，先防一下
+//                lessonVOList = new ArrayList<>();
+//                LessonVO defaultLesson = iLessonService.findSysFaultByMapAndPrdType(mapSystem.getMapId(), mapSystem.getPrdType());
+//                if (defaultLesson != null && MapStatus.Online.getCode().equals(defaultLesson.getStatus())) {
+//                    lessonVOList.add(defaultLesson);
+//                }
+//                List<LessonVO> lessonsICreated = iLessonService.queryNonDefaultLessons(loginInfo.getUserVO().getId(),
+//                        loginInfo.getProject(), BusinessConsts.STATUS_USE);
+//                lessonVOList.addAll(lessonsICreated);
+//                //如果当前用户有所属班级，查询所属有效班级关联的有效课程
+//                List<OrgUser> orgUsers = iOrgUserService.findEntities(loginInfo.getUserVO().getId(), null);
+//                List<Long> orgIds = orgUsers.stream().map(OrgUser::getOrgId).collect(Collectors.toList());
+//                List<Long> validOrgIds = iOrgService.findEntities(orgIds, BusinessConsts.Org.Status.VALID)
+//                        .stream().map(Org::getId).collect(Collectors.toList());
+//                Set<Long> lessonIdSet = lessonVOList.stream().map(LessonVO::getId).collect(Collectors.toSet());
+//                List<Long> orgLessonIds = iOrgLessonService.findEntitiesByOrgIds(validOrgIds).stream().map(OrgLesson::getLessonId)
+//                        .filter(lessonId -> !lessonIdSet.contains(lessonId)).distinct().collect(Collectors.toList());
+//                lessonVOList.addAll(iLessonService.queryByIds(orgLessonIds, BusinessConsts.STATUS_USE));
+//                //
+//            } else {
                 lessonVOList = iLessonService.getByMapIdAndPrdType(mapSystem.getMapId(), mapSystem.getPrdType());
-            }
+//            }
 
             if (CollectionUtils.isEmpty(lessonVOList)) {
                 return mapSystemDetailVO;
diff --git a/src/main/java/club/joylink/rtss/services/org/IOrgLessonService.java b/src/main/java/club/joylink/rtss/services/org/IOrgLessonService.java
index a59ee6a2e..905fed25c 100644
--- a/src/main/java/club/joylink/rtss/services/org/IOrgLessonService.java
+++ b/src/main/java/club/joylink/rtss/services/org/IOrgLessonService.java
@@ -1,19 +1,21 @@
 package club.joylink.rtss.services.org;
 
 import club.joylink.rtss.entity.OrgLesson;
+import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.UserVO;
 import club.joylink.rtss.vo.client.LessonVO;
 
 import java.util.List;
 
 public interface IOrgLessonService {
-    void updateOrgLesson(Long clsId, List<Long> lessonIds, UserVO user);
+    void updateOrgLesson(Long clsId, List<Long> lessonIds, LoginUserInfoVO loginInfo);
 
     /**
      * 查询该组织的课程
      * @param orgId
+     * @param user
      */
-    List<LessonVO> queryOrgLesson(Long orgId);
+    List<LessonVO> queryOrgLessonICreated(Long orgId, UserVO user);
 
     /**
      * 查询这些组织的课程关联关系
@@ -25,5 +27,5 @@ public interface IOrgLessonService {
 
     List<OrgLesson> findEntitiesByLessonId(Long lessonId);
 
-    List<OrgLesson> findEntitiesByOrgId(Long orgId);
+    List<OrgLesson> findEntitiesByOrgId(Long orgId, Long creatorId);
 }
diff --git a/src/main/java/club/joylink/rtss/services/org/OrgLessonService.java b/src/main/java/club/joylink/rtss/services/org/OrgLessonService.java
index af3d28590..ab7fa2311 100644
--- a/src/main/java/club/joylink/rtss/services/org/OrgLessonService.java
+++ b/src/main/java/club/joylink/rtss/services/org/OrgLessonService.java
@@ -2,15 +2,19 @@ package club.joylink.rtss.services.org;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.dao.OrgLessonDAO;
+import club.joylink.rtss.entity.Org;
 import club.joylink.rtss.entity.OrgLesson;
 import club.joylink.rtss.entity.OrgLessonExample;
 import club.joylink.rtss.services.ILessonService;
+import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.UserVO;
 import club.joylink.rtss.vo.client.LessonVO;
+import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -26,26 +30,33 @@ public class OrgLessonService implements IOrgLessonService {
     @Autowired
     private ILessonService iLessonService;
 
+    @Autowired
+    private IOrgUserService iOrgUserService;
+
     @Override
-    public void updateOrgLesson(Long clsId, List<Long> lessonIds, UserVO user) {
-        iOrgService.confirmExist(clsId);
-        //确认是该
+    public void updateOrgLesson(Long clsId, List<Long> lessonIds, LoginUserInfoVO loginInfo) {
+        //校验
+        Org topOrg = iOrgService.getTopOrgEntity(clsId, BusinessConsts.Org.Status.VALID);
+        Long userId = loginInfo.getUserVO().getId();
+        iOrgUserService.confirmIsTheRoleInThisOrg(userId, topOrg.getId(), BusinessConsts.OrgRole.Admin);
         //删除该组织的所有旧数据
         OrgLessonExample example = new OrgLessonExample();
-        example.createCriteria().andOrgIdEqualTo(clsId);
+        example.createCriteria().andOrgIdEqualTo(clsId).andCreatorIdEqualTo(userId);
         orgLessonDAO.deleteByExample(example);
         //添加新数据
         lessonIds.forEach(lessonId -> {
             OrgLesson orgLesson = new OrgLesson();
             orgLesson.setLessonId(lessonId);
             orgLesson.setOrgId(clsId);
+            orgLesson.setCreatorId(userId);
+            orgLesson.setCreateTime(LocalDateTime.now());
             orgLessonDAO.insert(orgLesson);
         });
     }
 
     @Override
-    public List<LessonVO> queryOrgLesson(Long orgId) {
-        List<OrgLesson> orgLessons = findEntitiesByOrgId(orgId);
+    public List<LessonVO> queryOrgLessonICreated(Long orgId, UserVO user) {
+        List<OrgLesson> orgLessons = findEntitiesByOrgId(orgId, user.getId());
         if (CollectionUtils.isEmpty(orgLessons)) {
             return new ArrayList<>();
         } else {
@@ -84,9 +95,12 @@ public class OrgLessonService implements IOrgLessonService {
     }
 
     @Override
-    public List<OrgLesson> findEntitiesByOrgId(Long orgId) {
+    public List<OrgLesson> findEntitiesByOrgId(@NonNull Long orgId, Long creatorId) {
         OrgLessonExample example = new OrgLessonExample();
-        example.createCriteria().andOrgIdEqualTo(orgId);
+        OrgLessonExample.Criteria criteria = example.createCriteria().andOrgIdEqualTo(orgId);
+        if (creatorId != null) {
+            criteria.andCreatorIdEqualTo(creatorId);
+        }
         return orgLessonDAO.selectByExample(example);
     }
 }
diff --git a/src/main/java/club/joylink/rtss/services/org/OrgService.java b/src/main/java/club/joylink/rtss/services/org/OrgService.java
index 289826a31..2fa8788cd 100644
--- a/src/main/java/club/joylink/rtss/services/org/OrgService.java
+++ b/src/main/java/club/joylink/rtss/services/org/OrgService.java
@@ -178,7 +178,7 @@ public class OrgService implements IOrgService {
 
     @Override
     public PageVO<DepartmentVO> pagedQueryCls(OrgQueryVO queryVO, LoginUserInfoVO loginInfo) {
-        OrgExample example = buildQueryClsExample(queryVO, loginInfo.getUserVO().getId(), loginInfo.getProject(), queryVO.isSelf());
+        OrgExample example = buildQueryClsExample(queryVO, loginInfo.getUserVO().getId(), loginInfo.getProject(), queryVO.getSelf());
         PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize());
         Page<Org> page = (Page<Org>) orgDAO.selectByExample(example);
         List<Long> creatorIds = page.stream().map(Org::getCreatorId).collect(Collectors.toList());
@@ -193,7 +193,7 @@ public class OrgService implements IOrgService {
 
     @Override
     public List<DepartmentVO> queryCls(OrgQueryVO queryVO, LoginUserInfoVO loginInfo) {
-        OrgExample example = buildQueryClsExample(queryVO, loginInfo.getUserVO().getId(), loginInfo.getProject(), queryVO.isSelf());
+        OrgExample example = buildQueryClsExample(queryVO, loginInfo.getUserVO().getId(), loginInfo.getProject(), queryVO.getSelf());
         List<Org> clsList = orgDAO.selectByExample(example);
         return clsList.stream().map(DepartmentVO::new).collect(Collectors.toList());
     }
@@ -244,13 +244,13 @@ public class OrgService implements IOrgService {
         return new CompanyVO(entity);
     }
 
-    private OrgExample buildQueryClsExample(OrgQueryVO queryVO, Long userId, Project project, boolean self) {
+    private OrgExample buildQueryClsExample(OrgQueryVO queryVO, Long userId, Project project, Boolean self) {
         Org topOrg = getEntity(project, BusinessConsts.Org.Status.VALID);
         OrgExample example = new OrgExample();
         OrgExample.Criteria criteria = example.createCriteria()
                 .andParentIdEqualTo(topOrg.getId())
                 .andStatusEqualTo(BusinessConsts.Org.Status.VALID);
-        if (self) {
+        if (self != null && self) {
             criteria.andCreatorIdEqualTo(userId);
         }
         if (queryVO != null) {
@@ -270,7 +270,7 @@ public class OrgService implements IOrgService {
         //检查同级同名组织
         List<Org> entities = findEntitiesByParentId(parentId, null, BusinessConsts.Org.Status.VALID);
         if (!CollectionUtils.isEmpty(entities)) {
-            BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(entities.stream().noneMatch(org -> org.getName().equals(name)),
+            BusinessExceptionAssertEnum.DATA_UNIQUE_PROPERTY_REPEAT.assertTrue(entities.stream().noneMatch(org -> org.getName().equals(name)),
                     String.format("上级为[%s]的同名组织已存在", parentId));
         }
         //创建新组织
diff --git a/src/main/java/club/joylink/rtss/vo/client/LessonPublishVO.java b/src/main/java/club/joylink/rtss/vo/client/LessonPublishVO.java
index bbb5d6c95..c5d575e62 100644
--- a/src/main/java/club/joylink/rtss/vo/client/LessonPublishVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/LessonPublishVO.java
@@ -32,4 +32,9 @@ public class LessonPublishVO {
 
     @ApiModelProperty(value = "班级id集合")
     private List<Long> classIdList;
+
+    /**
+     * 覆盖同名课程
+     */
+    private boolean coverSameNameLesson;
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java
index f182c3b59..d00565b2a 100644
--- a/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java
@@ -14,5 +14,5 @@ public class OrgQueryVO extends PageQueryVO {
 
     private Long topOrgId;
 
-    private boolean self;
+    private Boolean self;
 }

From 4e478b95a27f3ed3e521bfbe5f7b3e215c754d46 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 25 Mar 2021 19:46:34 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E6=95=99=E5=AD=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../joylink/rtss/services/ExamService.java    |  9 +++-
 .../joylink/rtss/services/LessonService.java  | 20 ++++----
 .../joylink/rtss/services/org/OrgService.java | 49 +++++++++++--------
 .../rtss/services/org/OrgUserService.java     |  5 ++
 .../rtss/vo/client/ExamDefinitionQueryVO.java |  2 -
 .../joylink/rtss/vo/client/LessonQueryVO.java |  5 +-
 .../rtss/vo/client/org/OrgQueryVO.java        |  2 +-
 7 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/services/ExamService.java b/src/main/java/club/joylink/rtss/services/ExamService.java
index ba07b304a..02a0035ac 100644
--- a/src/main/java/club/joylink/rtss/services/ExamService.java
+++ b/src/main/java/club/joylink/rtss/services/ExamService.java
@@ -622,8 +622,13 @@ public class ExamService implements IExamService {
             if (StringUtils.hasText(queryVO.getName())) {
                 criteria.andNameLike(String.format("%%%s%%", queryVO.getName()));
             }
-            if (queryVO.isSelf()) {
-                criteria.andCreatorIdEqualTo(loginInfo.getUserVO().getId());
+            if (StringUtils.hasText(queryVO.getCreatorName())) {
+                List<Long> creatorIds = iSysUserService.findUserByName(queryVO.getCreatorName()).stream().map(UserVO::getId).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(creatorIds)) {
+                    return new PageVO<>(queryVO.getPageNum(), queryVO.getPageSize(), 0, new ArrayList<>());
+                } else {
+                    criteria.andCreatorIdIn(creatorIds);
+                }
             }
             PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize());
             Page<ExamDefinition> page = (Page<ExamDefinition>) examDefinitionDAO.selectByExample(example);
diff --git a/src/main/java/club/joylink/rtss/services/LessonService.java b/src/main/java/club/joylink/rtss/services/LessonService.java
index 268cc4cc6..ef78d2270 100644
--- a/src/main/java/club/joylink/rtss/services/LessonService.java
+++ b/src/main/java/club/joylink/rtss/services/LessonService.java
@@ -566,19 +566,25 @@ public class LessonService implements ILessonService {
     @Override
     public PageVO<LessonVO> pagedQueryByLoginProject(LessonQueryVO queryVO, LoginUserInfoVO loginInfo) {
         List<MapVO> maps = iMapService.findOnlineMapByProjectCode(loginInfo.getProject().name());
+        PageVO<LessonVO> defaultPageVO = new PageVO<>(queryVO.getPageNum(), queryVO.getPageSize(), 0, new ArrayList<>());
         if (CollectionUtils.isEmpty(maps)) {
-            return new PageVO<>();
+            return defaultPageVO;
         } else {
             List<Long> mapIds = maps.stream().map(MapVO::getId).collect(Collectors.toList());
             LsLessonExample example = new LsLessonExample();
             Criteria criteria = example.createCriteria();
             criteria.andMapIdIn(mapIds).andSysfaultEqualTo(false).andStatusEqualTo(BusinessConsts.STATUS_USE);
-            if (queryVO.isSelf()) {
-                criteria.andCreatorIdEqualTo(loginInfo.getUserVO().getId());
-            }
             if (StringUtils.hasText(queryVO.getName())) {
                 criteria.andNameLike(String.format("%%%s%%", queryVO.getName()));
             }
+            if (StringUtils.hasText(queryVO.getCreatorName())) {
+                List<Long> creatorIds = iSysUserService.findUserByName(queryVO.getCreatorName()).stream().map(UserVO::getId).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(creatorIds)) {
+                    return defaultPageVO;
+                } else {
+                    criteria.andCreatorIdIn(creatorIds);
+                }
+            }
             PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize());
             Page<LsLesson> page = (Page<LsLesson>) lessonDAO.selectByExample(example);
             Map<Long, SysUser> creators = iSysUserService.findEntity(page.stream().map(LsLesson::getCreatorId).collect(Collectors.toList()), null)
@@ -590,11 +596,7 @@ public class LessonService implements ILessonService {
 
     @Override
     public List<LessonVO> queryByLoginProject(LessonQueryVO queryVO, LoginUserInfoVO loginInfo) {
-        if (queryVO.isSelf()) {
-            return queryNonDefaultLessons(loginInfo.getUserVO().getId(), loginInfo.getProject(), BusinessConsts.STATUS_USE);
-        } else {
-            return queryNonDefaultLessons(null, loginInfo.getProject(), BusinessConsts.STATUS_USE);
-        }
+        return queryNonDefaultLessons(null, loginInfo.getProject(), BusinessConsts.STATUS_USE);
     }
 
     @Override
diff --git a/src/main/java/club/joylink/rtss/services/org/OrgService.java b/src/main/java/club/joylink/rtss/services/org/OrgService.java
index 2fa8788cd..6ca999ed5 100644
--- a/src/main/java/club/joylink/rtss/services/org/OrgService.java
+++ b/src/main/java/club/joylink/rtss/services/org/OrgService.java
@@ -177,8 +177,25 @@ public class OrgService implements IOrgService {
     }
 
     @Override
-    public PageVO<DepartmentVO> pagedQueryCls(OrgQueryVO queryVO, LoginUserInfoVO loginInfo) {
-        OrgExample example = buildQueryClsExample(queryVO, loginInfo.getUserVO().getId(), loginInfo.getProject(), queryVO.getSelf());
+    public PageVO<DepartmentVO> pagedQueryCls(@NonNull OrgQueryVO queryVO, LoginUserInfoVO loginInfo) {
+        Org topOrg = getEntity(loginInfo.getProject(), BusinessConsts.Org.Status.VALID);
+        OrgExample example = new OrgExample();
+        OrgExample.Criteria criteria = example.createCriteria()
+                .andParentIdEqualTo(topOrg.getId())
+                .andStatusEqualTo(BusinessConsts.Org.Status.VALID);
+        if (queryVO != null) {
+            if (StringUtils.hasText(queryVO.getName())) {
+                criteria.andNameLike(String.format("%%%s%%", queryVO.getName()));
+            }
+        }
+        if (StringUtils.hasText(queryVO.getCreatorName())) {
+            List<Long> creatorIds = iSysUserService.findUserByName(queryVO.getCreatorName()).stream().map(UserVO::getId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(creatorIds)) {
+                return new PageVO<>(queryVO.getPageNum(), queryVO.getPageSize(), 0, new ArrayList<>());
+            } else {
+                criteria.andCreatorIdIn(creatorIds);
+            }
+        }
         PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize());
         Page<Org> page = (Page<Org>) orgDAO.selectByExample(example);
         List<Long> creatorIds = page.stream().map(Org::getCreatorId).collect(Collectors.toList());
@@ -193,7 +210,16 @@ public class OrgService implements IOrgService {
 
     @Override
     public List<DepartmentVO> queryCls(OrgQueryVO queryVO, LoginUserInfoVO loginInfo) {
-        OrgExample example = buildQueryClsExample(queryVO, loginInfo.getUserVO().getId(), loginInfo.getProject(), queryVO.getSelf());
+        Org topOrg = getEntity(loginInfo.getProject(), BusinessConsts.Org.Status.VALID);
+        OrgExample example = new OrgExample();
+        OrgExample.Criteria criteria = example.createCriteria()
+                .andParentIdEqualTo(topOrg.getId())
+                .andStatusEqualTo(BusinessConsts.Org.Status.VALID);
+        if (queryVO != null) {
+            if (StringUtils.hasText(queryVO.getName())) {
+                criteria.andNameLike(String.format("%%%s%%", queryVO.getName()));
+            }
+        }
         List<Org> clsList = orgDAO.selectByExample(example);
         return clsList.stream().map(DepartmentVO::new).collect(Collectors.toList());
     }
@@ -244,23 +270,6 @@ public class OrgService implements IOrgService {
         return new CompanyVO(entity);
     }
 
-    private OrgExample buildQueryClsExample(OrgQueryVO queryVO, Long userId, Project project, Boolean self) {
-        Org topOrg = getEntity(project, BusinessConsts.Org.Status.VALID);
-        OrgExample example = new OrgExample();
-        OrgExample.Criteria criteria = example.createCriteria()
-                .andParentIdEqualTo(topOrg.getId())
-                .andStatusEqualTo(BusinessConsts.Org.Status.VALID);
-        if (self != null && self) {
-            criteria.andCreatorIdEqualTo(userId);
-        }
-        if (queryVO != null) {
-            if (StringUtils.hasText(queryVO.getName())) {
-                criteria.andNameLike(String.format("%%%s%%", queryVO.getName()));
-            }
-        }
-        return example;
-    }
-
     /**
      * 创建非顶级组织
      */
diff --git a/src/main/java/club/joylink/rtss/services/org/OrgUserService.java b/src/main/java/club/joylink/rtss/services/org/OrgUserService.java
index 267bd9c7f..bc38edb31 100644
--- a/src/main/java/club/joylink/rtss/services/org/OrgUserService.java
+++ b/src/main/java/club/joylink/rtss/services/org/OrgUserService.java
@@ -427,6 +427,11 @@ public class OrgUserService implements IOrgUserService {
         confirmIsTheRoleInThisOrg(user.getId(), clsId, BusinessConsts.OrgRole.Teacher);
         Org topOrg = iOrgService.getEntity(cls.getRootId());
         Set<Long> studentIdSet = findEntitiesByOrgId(clsId, BusinessConsts.OrgRole.Student).stream().map(OrgUser::getUserId).collect(Collectors.toSet());
+        SysUser sysUser = importVO.convert2DB();
+        sysUser.setAccount(sysUser.getAccount() + topOrg.getCode());
+        UserVO userVO = iSysUserService.queryUserByAccount(sysUser.getAccount());
+        BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(userVO == null || !studentIdSet.contains(userVO.getId()),
+                "该学生已在班级中");
         this.importOrgUser(topOrg, cls.getId(), studentIdSet, importVO);
     }
 
diff --git a/src/main/java/club/joylink/rtss/vo/client/ExamDefinitionQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/ExamDefinitionQueryVO.java
index 28e12ac28..39c866808 100644
--- a/src/main/java/club/joylink/rtss/vo/client/ExamDefinitionQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/ExamDefinitionQueryVO.java
@@ -35,6 +35,4 @@ public class ExamDefinitionQueryVO extends PageQueryVO {
     private String status;
 
     private Integer clsId;
-
-    private boolean self;
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/LessonQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/LessonQueryVO.java
index 19017120d..326117789 100644
--- a/src/main/java/club/joylink/rtss/vo/client/LessonQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/LessonQueryVO.java
@@ -16,9 +16,6 @@ public class LessonQueryVO extends PageQueryVO {
     @ApiModelProperty(value = "地图id")
     private Long mapId;
 
-    /**
-     * 是否仅查询自己的
-     */
-    private boolean self;
+    private String creatorName;
 
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java
index d00565b2a..b99a2155f 100644
--- a/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/org/OrgQueryVO.java
@@ -14,5 +14,5 @@ public class OrgQueryVO extends PageQueryVO {
 
     private Long topOrgId;
 
-    private Boolean self;
+    private String creatorName;
 }

From 4801d11b3ba31e82d8ce04be47ea4441007a7b09 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 25 Mar 2021 20:42:19 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=95=99=E5=AD=A6=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../club/joylink/rtss/services/SysUserService.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/services/SysUserService.java b/src/main/java/club/joylink/rtss/services/SysUserService.java
index 6e7b0e255..e9dd9c448 100644
--- a/src/main/java/club/joylink/rtss/services/SysUserService.java
+++ b/src/main/java/club/joylink/rtss/services/SysUserService.java
@@ -708,12 +708,16 @@ public class SysUserService implements ISysUserService {
 
     @Override
     public List<SysUser> findEntity(List<Long> ids, String orderBy) {
-        SysUserExample example = new SysUserExample();
-        if (StringUtils.hasText(orderBy)) {
-            example.setOrderByClause(orderBy);
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        } else {
+            SysUserExample example = new SysUserExample();
+            if (StringUtils.hasText(orderBy)) {
+                example.setOrderByClause(orderBy);
+            }
+            example.createCriteria().andIdIn(ids);
+            return sysUserDAO.selectByExample(example);
         }
-        example.createCriteria().andIdIn(ids);
-        return sysUserDAO.selectByExample(example);
     }
 
     @Override

From 72a6546297ee40ed2d0c0db18dfbb61e3c3005d8 Mon Sep 17 00:00:00 2001
From: DU <dukang@163.com>
Date: Fri, 26 Mar 2021 16:43:18 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E7=94=9F=E6=88=90bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/services/runplan/RunPlanGenerator.java    | 14 +++++++++++---
 .../rtss/vo/client/runplan/RunPlanTripVO.java      |  2 +-
 .../joylink/rtss/vo/runplan/RunPlanInputData.java  |  6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java b/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java
index 36da9071a..c2b7449b5 100644
--- a/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java
+++ b/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java
@@ -425,23 +425,31 @@ public class RunPlanGenerator {
             }
         }
 
+        if(!inputData.hasOutAndInBound()){
+            serviceTripList.getFirst().setIsOutbound(true);
+            serviceTripList.getLast().setIsInbound(true);
+        }
         if (inputData.hasOutAndInBound()) {
             //找最快回库交路
             RunPlanRoutingVO inboundRouting;
             if (loop) {
                 inboundRouting = inboundRoutings.stream().filter(inRouting ->
-                        Objects.equals(inRouting.getStartStationCode(), otherLoop.getStartStationCode())/*&& Objects.equals(inRouting.getRight(), otherLoop.getRight())*/)
+                        Objects.equals(inRouting.getStartSectionCode(), otherLoop.getStartSectionCode())/*&& Objects.equals(inRouting.getRight(), otherLoop.getRight())*/)
                         .sorted(Comparator.comparingInt(o -> o.getParkSectionCodeList().size()))
                         .findFirst().orElse(null);
             } else {
                 inboundRouting = inboundRoutings.stream().filter(inRouting ->
-                        Objects.equals(inRouting.getStartStationCode(), outRefLoop.getStartStationCode())/*&& Objects.equals(inRouting.getRight(), outRefLoop.getRight())*/)
+                        Objects.equals(inRouting.getStartSectionCode(), outRefLoop.getStartSectionCode())/*&& Objects.equals(inRouting.getRight(), outRefLoop.getRight())*/)
                         .sorted(Comparator.comparingInt(o -> o.getParkSectionCodeList().size()))
                         .findFirst().orElse(null);
             }
             BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertNotTrue(Objects.isNull(inboundRouting), String.format("起始区段[%s]的入库交路不存在", loop ? mapVO.findSection(otherLoop.getStartSectionCode()).getName() : mapVO.findSection(outRefLoop.getStartSectionCode()).getName()));
             //构建回库计划
-            inputData.setInboundRouting(inboundRouting);
+//            inputData.setInboundRouting(inboundRouting);
+            //判断回库是否从终点区段开始
+            //如果不是 从上一次的车站
+
+
             buildServiceTrip(inputData, mapVO, inboundRouting, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
         }
         return serviceTripList;
diff --git a/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripVO.java b/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripVO.java
index b2701a49b..5f0f00b76 100644
--- a/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/runplan/RunPlanTripVO.java
@@ -117,7 +117,7 @@ public class RunPlanTripVO {
 
     public RunPlanTripVO(RunPlanRoutingVO routingVO) {
         this.right = routingVO.getRight();
-        this.destinationCode = routingVO.getDestinationCode();
+        this.destinationCode = Objects.isNull(routingVO.getDestinationCode()) ? "" : routingVO.getDestinationCode();
         this.startSectionCode = routingVO.getStartSectionCode();
         this.endSectionCode = routingVO.getEndSectionCode();
         this.timeList = new ArrayList<>();
diff --git a/src/main/java/club/joylink/rtss/vo/runplan/RunPlanInputData.java b/src/main/java/club/joylink/rtss/vo/runplan/RunPlanInputData.java
index d1f01e2eb..38d02adbe 100644
--- a/src/main/java/club/joylink/rtss/vo/runplan/RunPlanInputData.java
+++ b/src/main/java/club/joylink/rtss/vo/runplan/RunPlanInputData.java
@@ -50,9 +50,9 @@ public class RunPlanInputData {
     private boolean outAndIn = false;
 
 
-    /**回库交路*/
-    @JsonIgnore
-    private RunPlanRoutingVO inboundRouting;
+//    /**回库交路*/
+//    @JsonIgnore
+//    private RunPlanRoutingVO inboundRouting;
 
     @JsonIgnore
     public boolean multiService() {

From d1b8fcea3de00b266b0f9e85ce0fbc55c3900cb0 Mon Sep 17 00:00:00 2001
From: DU <dukang@163.com>
Date: Fri, 26 Mar 2021 16:44:21 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/runplan/RunPlanGenerator1.java   | 598 ------------------
 1 file changed, 598 deletions(-)
 delete mode 100644 src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator1.java

diff --git a/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator1.java b/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator1.java
deleted file mode 100644
index 286d479d9..000000000
--- a/src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator1.java
+++ /dev/null
@@ -1,598 +0,0 @@
-//package club.joylink.rtss.services.runplan;
-//
-//import club.joylink.rtss.constants.BusinessConsts;
-//import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-//import club.joylink.rtss.vo.client.map.MapVO;
-//import club.joylink.rtss.vo.client.map.newmap.MapSectionNewVO;
-//import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
-//import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
-//import club.joylink.rtss.vo.client.runplan.user.*;
-//import club.joylink.rtss.vo.runplan.RunPlanInput;
-//import club.joylink.rtss.vo.runplan.RunPlanInputData;
-//import lombok.AllArgsConstructor;
-//import lombok.Getter;
-//import lombok.NoArgsConstructor;
-//import lombok.Setter;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.util.CollectionUtils;
-//
-//import java.time.LocalTime;
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-///**
-// * 通用运行图生成
-// */
-//@Component
-//public class RunPlanGenerator1 {
-//
-//    private static final int OFFSET_TIME_HOURS = 2; //时间偏移早两小时
-//
-//    @Autowired
-//    private IRunPlanRoutingService runPlanRoutingService;
-//    @Autowired
-//    private IRunPlanRunlevelService runPlanRunlevelService;
-//    @Autowired
-//    private IRunPlanParktimeService runPlanParktimeService;
-//    @Autowired
-//    private IRunPlanUserConfigService runPlanUserConfigService;
-//
-//
-//    public List<RunPlanTripVO> generatorTrips(Long userId, RunPlanInput runPlanInput, MapVO mapVO) {
-//
-//        //校验发车停运时间
-//        BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(runPlanInput.getOverTime().isAfter(runPlanInput.getBeginTime()));
-//        //校验车站
-//
-//        LocalTime beginTimeOffset = runPlanInput.getBeginTime().minusHours(OFFSET_TIME_HOURS);
-//        //向前推两小时，如果到前一天，则时间不合理
-//        BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(runPlanInput.getBeginTime().isAfter(beginTimeOffset), "发车时间过早，建议晚于上午两点");
-//        runPlanInput.setBeginTime(beginTimeOffset);
-//        runPlanInput.setOverTime(runPlanInput.getOverTime().minusHours(OFFSET_TIME_HOURS));
-//
-//        //检查环路
-//        RunPlanRoutingVO running1Routing = runPlanRoutingService.queryUserRoutingByCode(userId, mapVO.getId(), runPlanInput.getRunningRouting1());
-//        RunPlanRoutingVO running2Routing = runPlanRoutingService.queryUserRoutingByCode(userId, mapVO.getId(), runPlanInput.getRunningRouting2());
-//        boolean isLoop = running1Routing.getParkSectionCodeList().get(0).getStationCode().equals(running2Routing.getParkSectionCodeList().get(running2Routing.getParkSectionCodeList().size() - 1).getStationCode())
-//                && running2Routing.getParkSectionCodeList().get(0).getStationCode().equals(running1Routing.getParkSectionCodeList().get(running1Routing.getParkSectionCodeList().size() - 1).getStationCode());
-//        BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(isLoop, "运行两交路无法构成环路数据");
-//        //查站间运行等级
-//        List<RunPlanRunlevelVO> levels = runPlanRunlevelService.queryUserRunLevels(userId, mapVO.getId());
-//        Map<String, Integer> runLevelTime = levels.stream().collect(Collectors.toMap(runLevelVO -> String.format("%s-%s", runLevelVO.getStartSectionCode(), runLevelVO.getEndSectionCode()), runLevelVO -> runLevelVO.getLevelTime(runPlanInput.getRunLevel())));
-//        //查停站时间
-//        List<RunPlanParkingTimeVO> parkTimes = runPlanParktimeService.queryUserParktimes(userId, mapVO.getId());
-//        Map<String, Integer> parkTime = parkTimes.stream().collect(Collectors.toMap(RunPlanParkingTimeVO::getSectionCode, RunPlanParkingTimeVO::getParkingTime));
-//        //查折返
-//        RunPlanUserConfigVO config = runPlanUserConfigService.getConfig(userId, mapVO.getId());
-//        Map<String, RunPlanUserConfigVO.ReentryTime> userReentryData = checkStationReentry(mapVO, running1Routing, config);
-//        //生成车次
-//        LinkedList<RunPlanTripVO> tripList = new LinkedList<>();
-//        //是否同时相向发车
-//        boolean opposite = Objects.isNull(runPlanInput.getRight());
-//        if (opposite) {
-//            //相向发车
-//            int initialServiceNum = 1;
-//            /*分别先发一辆车，计算控制左右发车服务号*/
-//            //上个服务号发车时刻
-//            //首班发车时间,首班车往返回来时间 来限定发车服务数量
-//            ServiceTempResult tempResultLeft = new ServiceTempResult(runPlanInput.getBeginTime(), null);
-//            serviceNumberDepart(mapVO, runPlanInput, running1Routing, running2Routing, initialServiceNum++, tripList, tempResultLeft, false, runLevelTime, parkTime, userReentryData);
-//
-//            //上个服务号发车时刻
-//            //首班发车时间,首班车往返回来时间 来限定发车服务数量
-//            ServiceTempResult tempResultRight = new ServiceTempResult(runPlanInput.getBeginTime(), null);
-//            serviceNumberDepart(mapVO, runPlanInput, running1Routing, running2Routing, initialServiceNum++, tripList, tempResultRight, true, runLevelTime, parkTime, userReentryData);
-//
-//            LocalTime firstRoundTripTimeLeft = tempResultLeft.getFirstRoundTripTime();
-//            LocalTime firstRoundTripTimeRight = tempResultRight.getFirstRoundTripTime();
-//            tempResultRight.setFirstRoundTripTime(firstRoundTripTimeLeft);
-//            tempResultLeft.setFirstRoundTripTime(firstRoundTripTimeRight);
-//
-//            //暂时先定义发完左行，再发右行..
-//            do {
-//                tempResultLeft.setPreServiceDepartTime(tempResultLeft.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()));
-//                serviceNumberDepart(mapVO, runPlanInput, running1Routing, running2Routing, initialServiceNum++, tripList, tempResultLeft, false, runLevelTime, parkTime, userReentryData);
-//            } while (tempResultLeft.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()*2).compareTo(tempResultLeft.getFirstRoundTripTime()) <= 0);
-//            //发完左行，再发右行
-//            do {
-//                tempResultRight.setPreServiceDepartTime(tempResultRight.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()));
-//                serviceNumberDepart(mapVO, runPlanInput, running1Routing, running2Routing, initialServiceNum++, tripList, tempResultRight, true, runLevelTime, parkTime, userReentryData);
-//            } while (tempResultRight.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()*2).compareTo(tempResultRight.getFirstRoundTripTime()) <= 0);
-//
-//        } else {
-//            //单向发车
-//            allServiceNumberDepart(mapVO, runPlanInput, running1Routing, running2Routing, tripList, runLevelTime, parkTime, userReentryData);
-//
-//        }
-//        return tripList;
-//
-//    }
-//
-//    /**
-//     * 服务号发车
-//     */
-//    private void serviceNumberDepart(MapVO mapVO, RunPlanInput runPlanInput, RunPlanRoutingVO running1Routing, RunPlanRoutingVO running2Routing, int initialServiceNum, LinkedList<RunPlanTripVO> tripList, ServiceTempResult serviceTempResult, boolean isRight, Map<String, Integer> runLevelMap, Map<String, Integer> parkTimeMap, Map<String, RunPlanUserConfigVO.ReentryTime> reentryData) {
-//        String serviceNumber = String.format("%03d", initialServiceNum);
-//        //初始化车次号,右行偶数，左行奇数
-//        int initTripNumber = isRight ? 0 : 1;
-//        LocalTime lastTripEndTime;//一个车次终点时间
-//        LinkedList<RunPlanTripVO> tempTripList = new LinkedList<>();
-//        String endStation = null;
-//        //根据运行时间判断结束末班车次
-//        do {
-//            RunPlanRoutingVO routing = Objects.equals(running1Routing.getRight(), isRight) ? running1Routing : running2Routing;
-//            RunPlanTripVO runPlanTripVO = new RunPlanTripVO(routing);
-//            runPlanTripVO.setServiceNumber(serviceNumber);
-//            setDirectionCode(mapVO, runPlanTripVO);
-//            runPlanTripVO.setIsReentry(true);
-//            //车次号
-//            String tripNumber = String.format("%03d", initTripNumber++);
-//            runPlanTripVO.setTripNumber(runPlanTripVO.getDirectionCode() + tripNumber);
-//            //首班右行方向
-//            LinkedList<RunPlanTripTimeVO> tripTimeList = new LinkedList<>();//车次时刻表
-//            int size = routing.getParkSectionCodeList().size();
-//            for (int i = 0; i < size; i++) {
-//                RunPlanRoutingSection routingSection = routing.getParkSectionCodeList().get(i);
-//                RunPlanTripTimeVO runPlanTripTimeVO = new RunPlanTripTimeVO();
-//                runPlanTripTimeVO.setStationCode(routingSection.getStationCode());
-//                runPlanTripTimeVO.setSectionCode(routingSection.getSectionCode());
-//                if (CollectionUtils.isEmpty(tempTripList) && i == 0) {//首发车次
-//                    runPlanTripTimeVO.setArrivalTime(serviceTempResult.getPreServiceDepartTime());
-//                    runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime());
-//                } else if (i == 0) { //其它车次发车
-//                    if (!startTBIsFront(routing, mapVO)) {
-//                        continue;
-//                    }
-//                    RunPlanUserConfigVO.ReentryTime reentryTime = reentryData.get(routingSection.getStationCode());
-//                    runPlanTripTimeVO.setArrivalTime(
-//                            tempTripList.getLast().getEndTime().plusSeconds(reentryTime.getTbFront() - parkTimeMap.get(runPlanTripTimeVO.getSectionCode()) * 2));
-//                    runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//                } else if (i == size - 1) {
-//                    Boolean endTBIsFront = endTBIsFront(routing, mapVO);
-//                    if (Objects.nonNull(endTBIsFront) && !endTBIsFront) {
-//                        continue;
-//                    }
-//                    runPlanTripTimeVO.setArrivalTime(CollectionUtils.isEmpty(tripTimeList)?tripList.getLast().getEndTime().plusSeconds(45)
-//                            : tripTimeList.getLast().getDepartureTime().plusSeconds(runLevelMap.get(tripTimeList.getLast().getSectionCode() + "-" + runPlanTripTimeVO.getSectionCode())));
-//                    runPlanTripTimeVO.setDepartureTime(Objects.isNull(endTBIsFront)
-//                            ? runPlanTripTimeVO.getArrivalTime()
-//                            : runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//                } else {
-//                    Boolean startTBIsFront = startTBIsFront(routing, mapVO);
-//                    if (i == 1 && Objects.nonNull(startTBIsFront) && !startTBIsFront) {
-//                        RunPlanUserConfigVO.ReentryTime reentryTime = reentryData.get( routing.getStartStationCode());
-//                        runPlanTripTimeVO.setArrivalTime(CollectionUtils.isEmpty(tempTripList)?serviceTempResult.getPreServiceDepartTime():tempTripList.getLast().getEndTime().plusSeconds(reentryTime.getTbBack() - reentryTime.getTbFrom()));
-//                        runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//                    }else{
-//                        runPlanTripTimeVO.setArrivalTime(tripTimeList.getLast().getDepartureTime().plusSeconds(runLevelMap.get(tripTimeList.getLast().getSectionCode() + "-" + runPlanTripTimeVO.getSectionCode())));
-//                        runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//                    }
-//                }
-//                tripTimeList.add(runPlanTripTimeVO);
-//            }
-//            runPlanTripVO.setTimeList(tripTimeList);
-//            setTripTerminalTime(runPlanTripVO, routing,tripTimeList,reentryData);
-//            lastTripEndTime = runPlanTripVO.getEndTime();
-//            if(CollectionUtils.isEmpty(tempTripList)){
-//                runPlanTripVO.setIsOutbound(true);
-//            }
-//            tempTripList.add(runPlanTripVO);
-//            if (tempTripList.size() > 50) { // 最快半小时跑一趟的一天车次数，如果大于这个，可能死循环，此时停止发车
-//                break;
-//            }
-//            isRight = !isRight;
-//            endStation = routing.getEndStationCode();
-//        } while (lastTripEndTime.isBefore(runPlanInput.getOverTime()));
-//        //设置服务号末班车次入库
-//        RunPlanTripVO lastrunPlanTrip = tempTripList.getLast();
-//        lastrunPlanTrip.setIsInbound(true);
-//        lastrunPlanTrip.setIsReentry(false);
-//        LinkedList<RunPlanTripTimeVO> tripTimeList = (LinkedList) lastrunPlanTrip.getTimeList();
-//        setTripEndTime(lastrunPlanTrip, endStation, tripTimeList, reentryData);
-//        tripList.addAll(tempTripList);
-//        if (Objects.isNull(serviceTempResult.getFirstRoundTripTime())) {
-//            serviceTempResult.setFirstRoundTripTime(tempTripList.get(0).getEndTime());
-//        }
-//        serviceTempResult.setPreServiceDepartTime(tempTripList.getFirst().getStartTime());
-//    }
-//
-//    /**
-//     * 单向发车
-//     */
-//    private void allServiceNumberDepart(MapVO mapVO, RunPlanInput runPlanInput, RunPlanRoutingVO running1Routing, RunPlanRoutingVO running2Routing, LinkedList<RunPlanTripVO> tripList, Map<String, Integer> runLevelTime, Map<String, Integer> parkTime, Map<String, RunPlanUserConfigVO.ReentryTime> userReentryData) {
-//
-//
-//        //设置初始服务号
-//        int initialServiceNum = 1;
-//        //上个服务号发车时刻
-//        //首班发车时间,首班车往返回来时间 来限定发车服务数量
-//        ServiceTempResult serviceTempResult = new ServiceTempResult(runPlanInput.getBeginTime(), null);
-//        do {
-//            if (initialServiceNum != 1) {
-//                if(initialServiceNum==2){
-//                    serviceTempResult.setFirstRoundTripTime(tripList.get(1).getEndTime());
-//                }
-//                serviceTempResult.setPreServiceDepartTime(serviceTempResult.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()));
-//            }
-//            serviceNumberDepart(mapVO, runPlanInput, running1Routing, running2Routing, initialServiceNum++, tripList, serviceTempResult, runPlanInput.getRight(), runLevelTime, parkTime, userReentryData);
-//
-//        } while (serviceTempResult.getPreServiceDepartTime().plusSeconds(runPlanInput.getDepartureTimeInterval()).compareTo(serviceTempResult.getFirstRoundTripTime()) <= 0);
-//
-//    }
-//
-//    public List<RunPlanTripVO> generatorTrips(Long userId, RunPlanInputData inputData, MapVO mapVO) {
-//        //校验时间
-//        BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(inputData.getOverTime().isAfter(inputData.getBeginTime()),"输入参数错误：发车时间应早于结束时间");
-//        LocalTime beginTimeOffset = inputData.getBeginTime().minusHours(OFFSET_TIME_HOURS);
-//        //向前推两小时，如果到前一天，则时间不合理
-//        BusinessExceptionAssertEnum.DATA_ERROR.assertTrue(inputData.getBeginTime().isAfter(beginTimeOffset), "发车时间过早，建议晚于上午两点");
-//        inputData.setBeginTime(beginTimeOffset);
-//        inputData.setOverTime(inputData.getOverTime().minusHours(OFFSET_TIME_HOURS));
-//
-//        //查交路
-//        RunPlanRoutingVO outboundRouting = null;
-//        if (inputData.hasOutbound()) {
-//            outboundRouting = runPlanRoutingService.queryUserRoutingByCode(userId, mapVO.getId(), inputData.getOutboundRouting());
-//            BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(outboundRouting.isOutBoundRoute(), "出库交路选择错误");
-//        }
-//        RunPlanRoutingVO inboundRouting = null;
-//        if (inputData.hasInbound()) {
-//            inboundRouting = runPlanRoutingService.queryUserRoutingByCode(userId, mapVO.getId(), inputData.getInboundRouting());
-//            BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(inboundRouting.isInBoundRoute(), "入库交路选择错误");
-//        }
-//        RunPlanRoutingVO running1Routing = runPlanRoutingService.queryUserRoutingByCode(userId, mapVO.getId(), inputData.getRunningRouting1());
-//        RunPlanRoutingVO running2Routing = runPlanRoutingService.queryUserRoutingByCode(userId, mapVO.getId(), inputData.getRunningRouting2());
-//        BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(running1Routing.isLoopRoute() && running2Routing.isLoopRoute(), "环线交路选择错误");
-//
-//        //构建环路 和 出入库关系
-//
-//        //验证 出库和入库 一端折返轨 一段转换轨，验证环路 两端折返轨 ，环路是否闭环  或出入库跟环路是否衔接
-//        boolean isLoop = running1Routing.getParkSectionCodeList().get(0).getSectionCode().equals(running2Routing.getParkSectionCodeList().get(running2Routing.getParkSectionCodeList().size() - 1).getSectionCode())
-//                && running2Routing.getParkSectionCodeList().get(0).getSectionCode().equals(running1Routing.getParkSectionCodeList().get(running1Routing.getParkSectionCodeList().size() - 1).getSectionCode());
-//        BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.assertTrue(isLoop, "运行两交路无法构成环路数据");
-//
-//        boolean outToRun1 = outboundRouting.getParkSectionCodeList().get(outboundRouting.getParkSectionCodeList().size() - 1).getSectionCode().equals(running1Routing.getParkSectionCodeList().get(0).getSectionCode());
-//        boolean outToRun2 = outboundRouting.getParkSectionCodeList().get(outboundRouting.getParkSectionCodeList().size() - 1).getSectionCode().equals(running2Routing.getParkSectionCodeList().get(0).getSectionCode());
-//
-//        boolean inToRun1 = inboundRouting.getParkSectionCodeList().get(0).getSectionCode().equals(running1Routing.getParkSectionCodeList().get(running1Routing.getParkSectionCodeList().size() - 1).getSectionCode());
-//        boolean inToRun2 = inboundRouting.getParkSectionCodeList().get(0).getSectionCode().equals(running2Routing.getParkSectionCodeList().get(running2Routing.getParkSectionCodeList().size() - 1).getSectionCode());
-//
-//        //出库的衔接环路
-//        RunPlanRoutingVO outRefLoop;
-//        //另一个交路
-//        RunPlanRoutingVO otherLoop;
-//        boolean same = false;
-//        if (outToRun1 && inToRun1) {
-//            same = true;
-//            outRefLoop = running1Routing;
-//            otherLoop = running2Routing;
-//        } else if (outToRun2 && inToRun2) {
-//            same = true;
-//            outRefLoop = running2Routing;
-//            otherLoop = running1Routing;
-//        } else if (outToRun1 && inToRun2) {
-//            outRefLoop = running1Routing;
-//            otherLoop = running2Routing;
-//        } else if (outToRun2 && inToRun1) {
-//            outRefLoop = running2Routing;
-//            otherLoop = running1Routing;
-//        } else {
-//            throw BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.exception("出入库交路与运行环路无法衔接匹配");
-//        }
-//        //查站间运行等级
-//        List<RunPlanRunlevelVO> levels = runPlanRunlevelService.queryUserRunLevels(userId, mapVO.getId());
-//        Map<String, Integer> runLevelMap = levels.stream().collect(Collectors.toMap(runLevelVO -> String.format("%s-%s", runLevelVO.getStartSectionCode(), runLevelVO.getEndSectionCode()), runLevelVO -> runLevelVO.getLevelTime(inputData.getRunLevel())));
-//        //查停站时间
-//        List<RunPlanParkingTimeVO> parktimes = runPlanParktimeService.queryUserParktimes(userId, mapVO.getId());
-//        Map<String, Integer> parkTimeMap = parktimes.stream().collect(Collectors.toMap(RunPlanParkingTimeVO::getSectionCode, RunPlanParkingTimeVO::getParkingTime));
-//        //查折返
-//        RunPlanUserConfigVO config = runPlanUserConfigService.getConfig(userId, mapVO.getId());
-//        Map<String, RunPlanUserConfigVO.ReentryTime> reentryData = checkStationReentry(mapVO, running1Routing, config);
-//        List<RunPlanTripVO> tripList = new ArrayList<>(100);
-//        ServiceTempResult serviceResult = new ServiceTempResult();
-//        //单个服务号还是多个
-//        if (Objects.nonNull(inputData.getDepartureInterval())) {
-//            do {
-//                generateService(inputData, mapVO, outboundRouting, inboundRouting, outRefLoop, same, otherLoop, runLevelMap, parkTimeMap, reentryData, tripList, serviceResult);
-//                inputData.setServiceNumber(String.format("%03d", Integer.parseInt(inputData.getServiceNumber()) + 1));
-//                inputData.setBeginTime(inputData.getBeginTime().plusSeconds(inputData.getDepartureInterval()));
-//            } while (serviceResult.preServiceDepartTime.plusSeconds(inputData.getDepartureInterval()).compareTo(serviceResult.firstRoundTripTime) <= 0);
-//
-//        } else {
-//            generateService(inputData, mapVO, outboundRouting, inboundRouting, outRefLoop, same, otherLoop, runLevelMap, parkTimeMap, reentryData, tripList, serviceResult);
-//        }
-//        return tripList;
-//    }
-//
-//    private Map<String, RunPlanUserConfigVO.ReentryTime> checkStationReentry(MapVO mapVO, RunPlanRoutingVO running1Routing, RunPlanUserConfigVO config) {
-//        BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(config) && config.hasReentryData(), "请配置所选运行线路折返数据");
-//        Map<String, RunPlanUserConfigVO.ReentryTime> reentryData = config.getConfig().getReentryData();
-//        // 检测折返站配置
-//        String startStationCode = running1Routing.getParkSectionCodeList().get(0).getStationCode();
-//        String endStationCode = running1Routing.getParkSectionCodeList().get(running1Routing.getParkSectionCodeList().size() - 1).getStationCode();
-//        if (Objects.isNull(reentryData.get(startStationCode))) {
-//            throw BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.exception(String.format("车站[%s]缺少折返数据", mapVO.findStation(startStationCode).getName()));
-//        }
-//        if(Objects.isNull(reentryData.get(endStationCode))){
-//            throw BusinessExceptionAssertEnum.ARGUMENT_ILLEGAL.exception(String.format("车站[%s]缺少折返数据", mapVO.findStation(endStationCode).getName()));
-//        }
-//        Boolean startTBIsFront = startTBIsFront(running1Routing, mapVO);
-//        if(Objects.nonNull(startTBIsFront) ){
-//            if (startTBIsFront) {
-//                BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(reentryData.get(startStationCode).getTbFront()), String.format("车站[%s]请配置站前折返数据", mapVO.findStation(startStationCode).getName()));
-//            } else {
-//                BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(reentryData.get(startStationCode).getTbBack()), String.format("车站[%s]请配置站后折返数据", mapVO.findStation(startStationCode).getName()));
-//            }
-//        }
-//
-//        Boolean endTBIsFront = endTBIsFront(running1Routing, mapVO);
-//        if(Objects.nonNull(endTBIsFront) ){
-//            if (endTBIsFront) {
-//                BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(reentryData.get(endStationCode).getTbFront()), String.format("车站[%s]请配置站前折返数据", mapVO.findStation(endStationCode).getName()));
-//            } else {
-//                BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(reentryData.get(endStationCode).getTbBack()), String.format("车站[%s]请配置站后折返数据", mapVO.findStation(endStationCode).getName()));
-//            }
-//        }
-//        return reentryData;
-//    }
-//
-//    private void generateService(RunPlanInputData inputData, MapVO mapVO, RunPlanRoutingVO outboundRouting, RunPlanRoutingVO inboundRouting, RunPlanRoutingVO outRefLoop, final boolean same, RunPlanRoutingVO otherLoop, Map<String, Integer> runLevelMap, Map<String, Integer> parkTimeMap, Map<String, RunPlanUserConfigVO.ReentryTime> reentryData, List<RunPlanTripVO> tripList, ServiceTempResult serviceResult) {
-//        LinkedList<RunPlanTripVO> serviceTripList = new LinkedList<>();
-//        int nextTripNumber = 1;
-//        //构建出库车次
-//        nextTripNumber = buildServiceTrip(inputData, mapVO, outboundRouting, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//
-//        //计算入库车次运行所需时间
-//        int num = inboundRouting.getParkSectionCodeList().size() - 1;
-//        int inboundTripRunTime = 0;
-//        int parkTime=0;
-//        int runTime;
-//        for (int i = 0; i < num - 1; i++) {
-//            RunPlanRoutingSection routingSection = inboundRouting.getParkSectionCodeList().get(i);
-//            RunPlanRoutingSection nextRoutingSection = inboundRouting.getParkSectionCodeList().get(i + 1);
-//            if (i == 0) {
-//                if (startTBIsFront(inboundRouting, mapVO)) {
-//                    parkTime = reentryData.get(routingSection.getStationCode()).getTbFront() - parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime = runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//                } else {
-//                    runTime = reentryData.get(routingSection.getStationCode()).getTbBack() - reentryData.get(routingSection.getStationCode()).getTbFrom();
-//                }
-//            } else {
-//                parkTime = parkTimeMap.get(routingSection.getSectionCode());
-//                runTime = runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//            }
-//            inboundTripRunTime = inboundTripRunTime + parkTime + runTime;
-//            parkTime = 0;
-//        }
-//
-//        //计算出库对接环路运行所需时间
-//        int oNum = outRefLoop.getParkSectionCodeList().size() - 1;
-//        int outRefTripRunTime = 0;
-//        for (int i = 0; i < oNum; i++) {
-//            RunPlanRoutingSection routingSection = outRefLoop.getParkSectionCodeList().get(i);
-//            RunPlanRoutingSection nextRoutingSection = outRefLoop.getParkSectionCodeList().get(i + 1);
-//            if(i==0){
-//                if(startTBIsFront(outRefLoop, mapVO)){
-//                    parkTime = reentryData.get(routingSection.getStationCode()).getTbFront()- parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime =  runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//                }else {
-//                    runTime = reentryData.get(routingSection.getStationCode()).getTbBack()-reentryData.get(routingSection.getStationCode()).getTbFrom();
-//                }
-//            }else if(i == oNum-1){
-//                if(endTBIsFront(outRefLoop,mapVO )){
-//                    parkTime = parkTimeMap.get(routingSection.getSectionCode())+parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime = runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//                }else{
-//                    parkTime = parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime = reentryData.get(nextRoutingSection.getStationCode()).getTbFrom();
-//                }
-//            }else{
-//                parkTime = parkTimeMap.get(routingSection.getSectionCode());
-//                runTime = runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//            }
-//            outRefTripRunTime = outRefTripRunTime + parkTime + runTime;
-//            parkTime = 0;
-//        }
-//
-//        //计算另一环路运行所需时间
-//        int iNum = otherLoop.getParkSectionCodeList().size()-1;
-//        int otherTripRunTime = 0;
-//        for (int i = 0; i < iNum; i++) {
-//            RunPlanRoutingSection routingSection = otherLoop.getParkSectionCodeList().get(i);
-//            RunPlanRoutingSection nextRoutingSection = otherLoop.getParkSectionCodeList().get(i + 1);
-//            if(i==0){
-//                if(startTBIsFront(otherLoop, mapVO)){
-//                    parkTime = reentryData.get(routingSection.getStationCode()).getTbFront()- parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime =  runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//                }else {
-//                    runTime = reentryData.get(routingSection.getStationCode()).getTbBack()-reentryData.get(routingSection.getStationCode()).getTbFrom();
-//                }
-//            }else if(i == iNum-1){
-//                if(endTBIsFront(otherLoop,mapVO )){
-//                    parkTime = parkTimeMap.get(routingSection.getSectionCode())+parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime = runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//                }else{
-//                    parkTime = parkTimeMap.get(routingSection.getSectionCode());
-//                    runTime = reentryData.get(nextRoutingSection.getStationCode()).getTbFrom();
-//                }
-//            }else{
-//                parkTime = parkTimeMap.get(routingSection.getSectionCode());
-//                runTime = runLevelMap.get(routingSection.getSectionCode() + "-" + nextRoutingSection.getSectionCode());
-//            }
-//            otherTripRunTime = otherTripRunTime + parkTime + runTime;
-//            parkTime = 0;
-//        }
-//        if (same ? true :
-//                (serviceTripList.getLast().getEndTime().plusSeconds(inboundTripRunTime).isBefore(inputData.getOverTime()) &&
-//                        (serviceTripList.getLast().getEndTime().getHour()<3
-//                                || serviceTripList.getLast().getEndTime().plusSeconds(outRefTripRunTime + otherTripRunTime + inboundTripRunTime).getHour() > 3))
-//        ) {
-//            //构建环路车次
-//            boolean loop = false;
-//            do {
-//                if (same) {
-//                    if (!loop) {
-//                        nextTripNumber = buildServiceTrip(inputData, mapVO, outRefLoop, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//                        loop = true;
-//                    } else {
-//                        nextTripNumber = buildServiceTrip(inputData, mapVO, otherLoop, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//                        nextTripNumber = buildServiceTrip(inputData, mapVO, outRefLoop, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//                    }
-//                } else {
-//                    nextTripNumber = buildServiceTrip(inputData, mapVO, outRefLoop, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//                    nextTripNumber = buildServiceTrip(inputData, mapVO, otherLoop, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//                }
-//            }
-//            while (serviceTripList.getLast().getEndTime().plusSeconds(inboundTripRunTime).isBefore(inputData.getOverTime())
-//                    &&
-//                    (serviceTripList.getLast().getEndTime().getHour() < 3 || serviceTripList.getLast().getEndTime().plusSeconds(outRefTripRunTime + otherTripRunTime + inboundTripRunTime).getHour() > 3));
-//        }
-//        //构建回库计划
-//        buildServiceTrip(inputData, mapVO, inboundRouting, runLevelMap, parkTimeMap, reentryData, serviceTripList, nextTripNumber);
-//
-//        if (Objects.isNull(serviceResult.getFirstRoundTripTime())) {
-//            serviceResult.setFirstRoundTripTime(serviceTripList.get(1).getEndTime());
-//        }
-//        serviceResult.setPreServiceDepartTime(serviceTripList.getFirst().getStartTime());
-//        tripList.addAll(serviceTripList);
-//    }
-//
-//     private int buildServiceTrip(RunPlanInputData inputData, MapVO mapVO, RunPlanRoutingVO routing,
-//                                   Map<String, Integer> runLevelMap, Map<String, Integer> parkTimeMap, Map<String, RunPlanUserConfigVO.ReentryTime> reentryData,
-//                                   LinkedList<RunPlanTripVO> tripList, int tripNumber) {
-//        RunPlanTripVO tripVO = new RunPlanTripVO(routing);
-//        setDirectionCode(mapVO, tripVO);
-//        tripVO.setServiceNumber(inputData.getServiceNumber());
-//        tripVO.setTripNumber(tripVO.getDirectionCode() + String.format("%03d", tripNumber));
-//        tripVO.setIsReentry(true);
-//        if (routing.isOutBoundRoute()) {
-//            tripVO.setIsOutbound(true);
-//        }
-//        if (routing.isInBoundRoute()) {
-//            tripVO.setIsInbound(true);
-//            tripVO.setIsReentry(false);
-//        }
-//        LinkedList<RunPlanTripTimeVO> tripTimeList = new LinkedList<>();
-//        int size = routing.getParkSectionCodeList().size();
-//        for (int i = 0; i < size; i++) {
-//            RunPlanRoutingSection routingSection = routing.getParkSectionCodeList().get(i);
-//            RunPlanTripTimeVO runPlanTripTimeVO = new RunPlanTripTimeVO();
-//            runPlanTripTimeVO.setStationCode(routingSection.getStationCode());
-//            runPlanTripTimeVO.setSectionCode(routingSection.getSectionCode());
-//            if (CollectionUtils.isEmpty(tripList) && i == 0) {//首发车次
-//                runPlanTripTimeVO.setArrivalTime(inputData.getBeginTime());
-//                runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime());
-//            } else if (i == 0) { //其它车次发车
-//                if (!startTBIsFront(routing, mapVO)) {
-//                    continue;
-//                }
-//                RunPlanUserConfigVO.ReentryTime reentryTime = reentryData.get(routingSection.getStationCode());
-//                runPlanTripTimeVO.setArrivalTime(
-//                        tripList.getLast().getEndTime().plusSeconds(reentryTime.getTbFront() - parkTimeMap.get(runPlanTripTimeVO.getSectionCode()) * 2));
-//                runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//            } else if (i == size - 1) {
-//                Boolean endTBIsFront = endTBIsFront(routing, mapVO);
-//                if (Objects.nonNull(endTBIsFront) && !endTBIsFront) {
-//                    continue;
-//                }
-//                runPlanTripTimeVO.setArrivalTime(CollectionUtils.isEmpty(tripTimeList)?tripList.getLast().getEndTime().plusSeconds(45)
-//                        : tripTimeList.getLast().getDepartureTime().plusSeconds(runLevelMap.get(tripTimeList.getLast().getSectionCode() + "-" + runPlanTripTimeVO.getSectionCode())));
-//                runPlanTripTimeVO.setDepartureTime(Objects.isNull(endTBIsFront)
-//                        ? runPlanTripTimeVO.getArrivalTime()
-//                        : runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//            } else {
-//                Boolean startTBIsFront = startTBIsFront(routing, mapVO);
-//                if (i == 1 && Objects.nonNull(startTBIsFront) && !startTBIsFront) {
-//                    RunPlanUserConfigVO.ReentryTime reentryTime = reentryData.get(routing.getStartStationCode());
-//                    runPlanTripTimeVO.setArrivalTime(CollectionUtils.isEmpty(tripList) ? inputData.getBeginTime() : tripList.getLast().getEndTime().plusSeconds(reentryTime.getTbBack() - reentryTime.getTbFrom()));
-//                    runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//                } else {
-//                    runPlanTripTimeVO.setArrivalTime(tripTimeList.getLast().getDepartureTime().plusSeconds(runLevelMap.get(tripTimeList.getLast().getSectionCode() + "-" + runPlanTripTimeVO.getSectionCode())));
-//                    runPlanTripTimeVO.setDepartureTime(runPlanTripTimeVO.getArrivalTime().plusSeconds(parkTimeMap.get(runPlanTripTimeVO.getSectionCode())));
-//                }
-//            }
-//            tripTimeList.add(runPlanTripTimeVO);
-//        }
-//        tripVO.setTimeList(tripTimeList);
-//        setTripTerminalTime(tripVO, routing,tripTimeList, reentryData);
-//        tripList.add(tripVO);
-//        return ++tripNumber;
-//    }
-//
-//    private void setDirectionCode(MapVO mapVO, RunPlanTripVO tripVO) {
-//        if (mapVO.getConfigVO().getUpRight()) {
-//            if (tripVO.getRight()) {
-//                tripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type02);
-//            } else {
-//                tripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type01);
-//            }
-//        } else {
-//            if (tripVO.getRight()) {
-//                tripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type01);
-//            } else {
-//                tripVO.setDirectionCode(BusinessConsts.RunPlan.DirectionType.Type02);
-//            }
-//        }
-//    }
-//
-//    public void setTripTerminalTime(RunPlanTripVO runPlanTripVO,  RunPlanRoutingVO routing,LinkedList<RunPlanTripTimeVO> tripTimeList, Map<String, RunPlanUserConfigVO.ReentryTime> reentryData) {
-//        setTripStartTime(runPlanTripVO, routing.getStartStationCode(),tripTimeList, reentryData);
-//        setTripEndTime(runPlanTripVO, routing.getEndStationCode(),tripTimeList, reentryData);
-//    }
-//
-//    private void setTripStartTime(RunPlanTripVO runPlanTripVO,  String startStation,LinkedList<RunPlanTripTimeVO> tripTimeList, Map<String, RunPlanUserConfigVO.ReentryTime> reentryData) {
-//        RunPlanTripTimeVO firstTripTime = tripTimeList.getFirst();
-//        if (Objects.equals(runPlanTripVO.getStartSectionCode(), firstTripTime.getSectionCode())) {
-//            runPlanTripVO.setStartTime(tripTimeList.getFirst().getArrivalTime());
-//        } else {
-////            BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(reentryData.get(firstTripTime.getStationCode()).getTbTo()), String.format("车站[%s]折返数据请配置折返轨至起始股道",firstTripTime.getStationCode()));
-//            runPlanTripVO.setStartTime(firstTripTime.getArrivalTime().minusSeconds(reentryData.get(startStation).getTbTo()));
-//        }
-//    }
-//
-//    private void setTripEndTime(RunPlanTripVO runPlanTripVO,  String endStation,LinkedList<RunPlanTripTimeVO> tripTimeList, Map<String, RunPlanUserConfigVO.ReentryTime> reentryData) {
-//        RunPlanTripTimeVO lastTripTime = tripTimeList.getLast();
-//        if (Objects.equals(runPlanTripVO.getEndSectionCode(), lastTripTime.getSectionCode())) {
-//            runPlanTripVO.setEndTime(lastTripTime.getDepartureTime());
-//        } else if(Objects.equals(runPlanTripVO.getStartSectionCode(), lastTripTime.getSectionCode())){
-//            runPlanTripVO.setEndTime(lastTripTime.getDepartureTime().plusSeconds(45));//转换轨直接到折返轨的交路
-//        }  else{
-////            BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(reentryData.get(lastTripTime.getStationCode()).getTbFrom()), String.format("车站[%s]折返数据请配置轨道至折返轨",lastTripTime.getStationCode()));
-//
-//            runPlanTripVO.setEndTime(lastTripTime.getDepartureTime().plusSeconds(reentryData.get(endStation).getTbFrom()));
-//        }
-//    }
-//
-//    public Boolean startTBIsFront(RunPlanRoutingVO runningRouting, MapVO mapVO) {
-//        MapSectionNewVO startReentrySection = mapVO.findSection(runningRouting.getStartSectionCode());
-//        if (startReentrySection.isReentryTrack()) {
-//            if (startReentrySection.isStandTrack()) {
-//                return true;
-//            }
-//            return false;
-//        }
-//        return null;
-//    }
-//
-//    public Boolean endTBIsFront(RunPlanRoutingVO runningRouting, MapVO mapVO) {
-//        MapSectionNewVO endReentrySection = mapVO.findSection(runningRouting.getEndSectionCode());
-//        if (endReentrySection.isReentryTrack()) {
-//            if (endReentrySection.isStandTrack()) {
-//                return true;
-//            }
-//            return false;
-//        }
-//        return null;
-//    }
-//
-//    @Getter
-//    @Setter
-//    @AllArgsConstructor
-//    @NoArgsConstructor
-//    private class ServiceTempResult {
-//        private LocalTime preServiceDepartTime;
-//        private LocalTime firstRoundTripTime;
-//    }
-//
-//}