修改文章管理、栏目管理

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

@@ -39,6 +39,12 @@ public class ZhjqArticle extends BaseEntity {
     private String intro;
 
     /**
+     * 简介
+     */
+    @Excel(name = "图片")
+    private String img;
+
+    /**
      * 内容
      */
     @Excel(name = "内容")

zhjq-business/src/main/java/com/zhjq/service/imp/ZhjqArticleServiceImpl.java

@@ -6,11 +6,14 @@ import com.zhjq.common.utils.DateUtils;
 import com.zhjq.common.utils.StringUtils;
 import com.zhjq.domain.ZhjqArticle;
 import com.zhjq.mapper.ZhjqArticleMapper;
+import com.zhjq.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zhjq.service.IZhjqArticleService;
 
+import javax.annotation.Resource;
+
 /**
  * 文章管理Service业务层处理
  *
@@ -19,7 +22,11 @@ import com.zhjq.service.IZhjqArticleService;
  */
 @Service
 public class ZhjqArticleServiceImpl implements IZhjqArticleService {
-    @Autowired
+
+    @Resource
+    private ISysConfigService configService;
+
+    @Resource
     private ZhjqArticleMapper zhjqArticleMapper;
 
     /**
@@ -30,7 +37,9 @@ public class ZhjqArticleServiceImpl implements IZhjqArticleService {
      */
     @Override
     public ZhjqArticle selectZhjqArticleById(Long id) {
-        return zhjqArticleMapper.selectZhjqArticleById(id);
+        ZhjqArticle zhjqArticle = zhjqArticleMapper.selectZhjqArticleById(id);
+        zhjqArticle.setImg(configService.selectConfigByKey("server_url")+zhjqArticle.getImg());
+        return zhjqArticle;
     }
 
     /**
@@ -93,6 +102,10 @@ public class ZhjqArticleServiceImpl implements IZhjqArticleService {
 
     @Override
     public List<ZhjqArticle> getArticleAppList(Long columnId, int limit) {
-        return zhjqArticleMapper.getArticleAppList(columnId, limit);
+        List<ZhjqArticle> zhjqArticles = zhjqArticleMapper.getArticleAppList(columnId, limit);
+        for (ZhjqArticle a : zhjqArticles) {
+            a.setImg(configService.selectConfigByKey("server_url") + a.getImg());
+        }
+        return zhjqArticles;
     }
 }

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

@@ -8,6 +8,7 @@
         <result property="id" column="id"/>
         <result property="journalismName" column="Journalism_name"/>
         <result property="intro" column="intro"/>
+        <result property="img" column="img"/>
         <result property="journalismContent" column="Journalism_content"/>
         <result property="createTime" column="create_time"/>
         <result property="sort" column="sort"/>
@@ -17,7 +18,7 @@
     </resultMap>
 
     <sql id="selectZhjqArticleVo">
-        select id, Journalism_name, intro, Journalism_content, create_time, sort, column_id, author,release_time from zhjq_article
+        select id, Journalism_name, intro, img, Journalism_content, create_time, sort, column_id, author,release_time from zhjq_article
     </sql>
 
     <select id="selectZhjqArticleList" parameterType="ZhjqArticle" resultMap="ZhjqArticleResult">
@@ -25,6 +26,7 @@
             a.id,
             a.Journalism_name,
             a.intro,
+            a.img,
             a.Journalism_content,
             a.create_time,
             a.sort,
@@ -52,6 +54,7 @@
             a.id,
             a.Journalism_name,
             a.intro,
+            a.img,
             a.Journalism_content,
             a.create_time,
             a.sort,
@@ -75,6 +78,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="journalismName != null">Journalism_name,</if>
             <if test="intro != null">intro,</if>
+            <if test="img != null">img,</if>
             <if test="journalismContent != null">Journalism_content,</if>
             <if test="createTime != null">create_time,</if>
             <if test="sort != null">sort,</if>
@@ -99,6 +103,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="journalismName != null">Journalism_name = #{journalismName},</if>
             <if test="intro != null">intro = #{intro},</if>
+            <if test="img != null">img = #{img},</if>
             <if test="journalismContent != null">Journalism_content = #{journalismContent},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="sort != null">sort = #{sort},</if>
@@ -127,6 +132,7 @@
             a.id,
             a.Journalism_name,
             a.intro,
+            a.img,
             a.Journalism_content,
             a.create_time,
             a.sort,

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

@@ -169,6 +169,9 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="图片" prop="img">
+          <file-upload v-model="form.img" :limit="1" :file-type="['png','jpg','jpeg']" :file-size="10"/>
+        </el-form-item>
         <el-form-item label="内容" prop="journalismContent">
           <editor style="height: 300px" label="富文本控件" v-model="form.journalismContent" maxlength="4000" show-word-limit/>
         </el-form-item>
@@ -443,12 +446,6 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/article/export', {
-        ...this.queryParams
-      }, `article_${new Date().getTime()}.xlsx`)
     }
   }
 }

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

@@ -125,13 +125,13 @@
     />
 
     <!-- 添加或修改轮播管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="appName">
           <el-input v-model="form.appName" placeholder="请输入名称" maxlength="25"/>
         </el-form-item>
         <el-form-item label="文件" prop="appUrl">
-          <file-upload v-model="form.appUrl"/>
+          <file-upload v-model="form.appUrl" :limit="1"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">