排序

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/domain/JnbKnowledgeBase.java

@@ -55,6 +55,11 @@ public class JnbKnowledgeBase extends BaseEntity {
     @Excel(name = "浏览数")
     private Long watchNum;
 
+    /**
+     * 创建人id
+     */
+    @Excel(name = "创建人id")
+    private Long createId;
 
     public void setId(Long id) {
         this.id = id;
@@ -112,6 +117,13 @@ public class JnbKnowledgeBase extends BaseEntity {
         return watchNum;
     }
 
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
 
     @Override
     public String toString() {
@@ -128,6 +140,7 @@ public class JnbKnowledgeBase extends BaseEntity {
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("delFlag", getDelFlag())
+                .append("createId", getCreateId())
                 .toString();
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/service/impl/JnbKnowledgeBaseServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
 import com.sooka.jnb.knowledge.domain.JnbKnowledgeBaseImg;
@@ -61,6 +62,7 @@ public class JnbKnowledgeBaseServiceImpl implements IJnbKnowledgeBaseService {
     @Transactional(rollbackFor = Exception.class)
     public int insertJnbKnowledgeBase(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
         jnbKnowledgeBaseVO.setPopular(false);
+        jnbKnowledgeBaseVO.setCreateId(SecurityUtils.getUserId());
         jnbKnowledgeBaseVO.setCreateTime(DateUtils.getNowDate());
         jnbKnowledgeBaseMapper.insertJnbKnowledgeBase(jnbKnowledgeBaseVO);
         if (StringUtils.isNotEmpty(jnbKnowledgeBaseVO.getImgUrlList())) {
@@ -86,6 +88,7 @@ public class JnbKnowledgeBaseServiceImpl implements IJnbKnowledgeBaseService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateJnbKnowledgeBase(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
+        jnbKnowledgeBaseVO.setUpdateBy(SecurityUtils.getUsername());
         jnbKnowledgeBaseVO.setUpdateTime(DateUtils.getNowDate());
         jnbKnowledgeBaseMapper.updateJnbKnowledgeBase(jnbKnowledgeBaseVO);
         if (StringUtils.isNotEmpty(jnbKnowledgeBaseVO.getImgUrlList())) {

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/vo/JnbKnowledgeBaseVO.java

@@ -89,4 +89,10 @@ public class JnbKnowledgeBaseVO {
      * 知识库图片路径
      */
     private String imgUrlList;
+
+    /**
+     * 创建人id
+     */
+    @Excel(name = "创建人id")
+    private Long createId;
 }

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerMapper.xml

@@ -41,6 +41,7 @@
         <if test="textDetails != null  and textDetails != ''">and text_details = #{textDetails}</if>
         <if test="type != null ">and jhs.type = #{type}</if>
         GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
     </select>
 
     <select id="selectJnbHighServerById" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
@@ -118,6 +119,7 @@
         left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
         where jhs.del_flag = 0 and jhs.type = 5
         GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
     </select>
     <select id="liveBroadcastDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
         SELECT jhs.id,
@@ -155,6 +157,7 @@
                  left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
         where jhs.del_flag = 0 and jhs.type = 6
         GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
     </select>
     <select id="lifeServicesDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
         SELECT jhs.id,

sooka-jnb/src/main/resources/mapper/knowledge/JnbKnowledgeBaseMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="integral"    column="integral"    />
         <result property="likeNum"    column="like_num"    />
         <result property="watchNum"    column="watch_num"    />
+        <result property="createId"    column="create_id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             integral,
             like_num,
             watch_num,
+            jkb.create_id,
             jkb.create_by,
             jkb.create_time,
             jkb.update_by,
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null">integral,</if>
             <if test="likeNum != null">like_num,</if>
             <if test="watchNum != null">watch_num,</if>
+            <if test="createId != null">create_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null">#{integral},</if>
             <if test="likeNum != null">#{likeNum},</if>
             <if test="watchNum != null">#{watchNum},</if>
+            <if test="createId != null">#{createId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -131,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             integral,
             like_num,
             watch_num,
+            jkb.create_id,
             jkb.create_by,
             jkb.create_time,
             jkb.update_by,
@@ -142,5 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left join jnb_knowledge_base_img jkbi on jkb.id = jkbi.knowledge_id and jkbi.del_flag = 0
         where jkb.del_flag = 0 and popular = 1
         GROUP BY jkb.id
+        order by create_time,watch_num,like_num desc
     </select>
 </mapper>