修改文章管理、栏目管理

zhjq-business/src/main/java/com/zhjq/domain/ZhjqArticle.java

@@ -1,5 +1,7 @@
 package com.zhjq.domain;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zhjq.common.annotation.Excel;
@@ -15,6 +17,7 @@ import java.util.List;
  * @author lc
  * @date 2024-12-16
  */
+@Data
 public class ZhjqArticle extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -30,6 +33,12 @@ public class ZhjqArticle extends BaseEntity {
     private String journalismName;
 
     /**
+     * 简介
+     */
+    @Excel(name = "简介")
+    private String intro;
+
+    /**
      * 内容
      */
     @Excel(name = "内容")
@@ -60,30 +69,6 @@ public class ZhjqArticle extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date releaseTime;
 
-    public Date getReleaseTime() {
-        return releaseTime;
-    }
-
-    public void setReleaseTime(Date releaseTime) {
-        this.releaseTime = releaseTime;
-    }
-
-    public String getColumnName() {
-        return columnName;
-    }
-
-    public void setColumnName(String columnName) {
-        this.columnName = columnName;
-    }
-
-    public List<Long> getColumnList() {
-        return columnList;
-    }
-
-    public void setColumnList(List<Long> columnList) {
-        this.columnList = columnList;
-    }
-
     /**
      * 票种
      */
@@ -94,67 +79,4 @@ public class ZhjqArticle extends BaseEntity {
      */
     private List<Long> columnList;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setJournalismName(String journalismName) {
-        this.journalismName = journalismName;
-    }
-
-    public String getJournalismName() {
-        return journalismName;
-    }
-
-    public void setJournalismContent(String journalismContent) {
-        this.journalismContent = journalismContent;
-    }
-
-    public String getJournalismContent() {
-        return journalismContent;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public void setColumnId(Long columnId) {
-        this.columnId = columnId;
-    }
-
-    public Long getColumnId() {
-        return columnId;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("journalismName", getJournalismName())
-                .append("journalismContent", getJournalismContent())
-                .append("columnName", getColumnName())
-                .append("columnList", getColumnList())
-                .append("createTime", getCreateTime())
-                .append("sort", getSort())
-                .append("columnId", getColumnId())
-                .append("author", getAuthor())
-                .append("releaseTime", getReleaseTime())
-                .toString();
-    }
 }

zhjq-business/src/main/resources/mapper/ZhjqArticleMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="ZhjqArticle" id="ZhjqArticleResult">
         <result property="id" column="id"/>
         <result property="journalismName" column="Journalism_name"/>
+        <result property="intro" column="intro"/>
         <result property="journalismContent" column="Journalism_content"/>
         <result property="createTime" column="create_time"/>
         <result property="sort" column="sort"/>
@@ -16,23 +17,23 @@
     </resultMap>
 
     <sql id="selectZhjqArticleVo">
-        select id, Journalism_name, Journalism_content, create_time, sort, column_id, author,release_time
-        from zhjq_article
+        select id, Journalism_name, intro, Journalism_content, create_time, sort, column_id, author,release_time from zhjq_article
     </sql>
 
     <select id="selectZhjqArticleList" parameterType="ZhjqArticle" resultMap="ZhjqArticleResult">
         SELECT
-        a.id,
-        a.Journalism_name,
-        a.Journalism_content,
-        a.create_time,
-        a.sort,
-        a.column_id,
-        a.release_time,
-        a.author,
-        b.column_name AS columnName
+            a.id,
+            a.Journalism_name,
+            a.intro,
+            a.Journalism_content,
+            a.create_time,
+            a.sort,
+            a.column_id,
+            a.release_time,
+            a.author,
+            b.column_name AS columnName
         FROM
-        zhjq_article a
+            zhjq_article a
         LEFT JOIN zhjq_column b ON a.column_id = b.column_id
         <where>
             <if test="journalismName != null  and journalismName != ''">and a.Journalism_name like concat('%',
@@ -50,6 +51,7 @@
         SELECT
             a.id,
             a.Journalism_name,
+            a.intro,
             a.Journalism_content,
             a.create_time,
             a.sort,
@@ -71,63 +73,38 @@
             keyProperty="id">
         insert into zhjq_article
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="journalismName != null">Journalism_name,
-            </if>
-            <if test="journalismContent != null">Journalism_content,
-            </if>
-            <if test="createTime != null">create_time,
-            </if>
-            <if test="sort != null">sort,
-            </if>
-            <if test="columnId != null">column_id,
-            </if>
-            <if test="author != null">author,
-            </if>
-            <if test="releaseTime != null">release_time,
-            </if>
+            <if test="journalismName != null">Journalism_name,</if>
+            <if test="intro != null">intro,</if>
+            <if test="journalismContent != null">Journalism_content,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="sort != null">sort,</if>
+            <if test="columnId != null">column_id,</if>
+            <if test="author != null">author,</if>
+            <if test="releaseTime != null">release_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="journalismName != null">#{journalismName},
-            </if>
-            <if test="journalismContent != null">#{journalismContent},
-            </if>
-            <if test="createTime != null">#{createTime},
-            </if>
-            <if test="sort != null">#{sort},
-            </if>
-            <if test="columnId != null">#{columnId},
-            </if>
-            <if test="author != null">#{author},
-            </if>
-            <if test="releaseTime != null">#{releaseTime},
-            </if>
+            <if test="journalismName != null">#{journalismName},</if>
+            <if test="intro != null">#{intro},</if>
+            <if test="journalismContent != null">#{journalismContent},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="columnId != null">#{columnId},</if>
+            <if test="author != null">#{author},</if>
+            <if test="releaseTime != null">#{releaseTime},</if>
         </trim>
     </insert>
 
     <update id="updateZhjqArticle" parameterType="ZhjqArticle">
         update zhjq_article
         <trim prefix="SET" suffixOverrides=",">
-            <if test="journalismName != null">Journalism_name =
-                #{journalismName},
-            </if>
-            <if test="journalismContent != null">Journalism_content =
-                #{journalismContent},
-            </if>
-            <if test="createTime != null">create_time =
-                #{createTime},
-            </if>
-            <if test="sort != null">sort =
-                #{sort},
-            </if>
-            <if test="columnId != null">column_id =
-                #{columnId},
-            </if>
-            <if test="author != null">author =
-                #{author},
-            </if>
-            <if test="releaseTime != null">release_time =
-                #{releaseTime},
-            </if>
+            <if test="journalismName != null">Journalism_name = #{journalismName},</if>
+            <if test="intro != null">intro = #{intro},</if>
+            <if test="journalismContent != null">Journalism_content = #{journalismContent},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="columnId != null">column_id = #{columnId},</if>
+            <if test="author != null">author = #{author},</if>
+            <if test="releaseTime != null">release_time = #{releaseTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -145,27 +122,11 @@
         </foreach>
     </delete>
 
-    <select id="selectZhjqArticleByColumnId" parameterType="Long"
-            resultMap="ZhjqArticleResult">
-        SELECT a.id,
-               a.Journalism_name,
-               a.Journalism_content,
-               a.create_time,
-               a.sort,
-               a.column_id,
-               a.release_time,
-               a.author,
-               b.column_id AS columnId,
-               b.column_name as columnName
-        FROM zhjq_article a
-                 LEFT JOIN zhjq_column b ON a.column_id = b.column_id
-        where a.column_id = #{columnId}
-    </select>
-
     <select id="getArticleAppList" parameterType="ZhjqArticle" resultMap="ZhjqArticleResult">
         SELECT
             a.id,
             a.Journalism_name,
+            a.intro,
             a.Journalism_content,
             a.create_time,
             a.sort,

zhjq-common/src/main/java/com/zhjq/common/utils/StringUtils.java

@@ -586,7 +586,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
      */
     public static final String space2nbsp(final String s) {
         if(!StringUtils.isEmpty(s)) {
-            return s.replaceAll(" "," ");
+            return s.replaceAll("  ","  ");
         } else {
             return s;
         }

zhjq-ui/src/components/Editor/index.vue

@@ -182,7 +182,7 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(length, "image", "http://192.168.4.30:8080" + res.fileName);
         // 调整光标到最后
         quill.setSelection(length + 1);
       } else {

zhjq-ui/src/views/system/article/index.vue

@@ -131,7 +131,10 @@
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="标题" prop="journalismName">
-          <el-input v-model="form.journalismName" placeholder="请输入标题"/>
+          <el-input v-model="form.journalismName" placeholder="请输入标题" maxlength="30" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="简介" prop="intro">
+          <el-input v-model="form.intro" placeholder="请输入简介" maxlength="30" show-word-limit/>
         </el-form-item>
         <el-row>
           <el-col :span="12">
@@ -145,7 +148,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="作者" prop="author">
-              <el-input v-model="form.author" placeholder="请输入作者"/>
+              <el-input v-model="form.author" placeholder="请输入作者" maxlength="10" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -154,20 +157,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-
             <el-form-item label="栏目" prop="columnId">
               <treeselect
                   v-model="form.columnId"
                   :options="menuOptions"
                   :normalizer="normalizer"
                   :show-count="true"
+                  :disable-branch-nodes="true"
                   placeholder="选择栏目"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="内容" prop="journalismContent">
-          <editor style="height: 300px" label="富文本控件" v-model="form.journalismContent"/>
+          <editor style="height: 300px" label="富文本控件" v-model="form.journalismContent" maxlength="4000" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -243,6 +246,11 @@ export default {
             required: true, message: "标题不能为空", trigger: "blur"
           }
         ],
+        columnId: [
+          {
+            required: true, message: "栏目不能为空", trigger: "blur"
+          }
+        ],
         author: [
           {
             required: true, message: "作者不能为空", trigger: "blur"
@@ -308,7 +316,7 @@ export default {
     getTreeselect() {
       columnAllList().then(response => {
         this.menuOptions = [];
-        const menu = {columnId: 0, columnName: '主类目', children: []};
+        const menu = {columnId: 0, columnName: '主类目',  children: []};
         menu.children = this.handleTree(response.data, "columnId");
         this.menuOptions.push(menu);
       });