修改文章管理、栏目管理

zhjq-business/src/main/java/com/zhjq/controller/ZhjqSceneryController.java

@@ -3,15 +3,9 @@ package com.zhjq.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zhjq.domain.ZhjqArticle;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.zhjq.common.annotation.Log;
 import com.zhjq.common.core.controller.BaseController;
 import com.zhjq.common.core.domain.AjaxResult;
@@ -88,4 +82,13 @@ public class ZhjqSceneryController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(zhjqSceneryService.deleteZhjqSceneryByIds(ids));
     }
+
+    /**
+     * 小程序获取文章管理列表
+     */
+    @GetMapping("/sceneryAppList")
+    public AjaxResult sceneryAppList() {
+        List<ZhjqScenery> result = zhjqSceneryService.selectZhjqSceneryList(new ZhjqScenery());
+        return AjaxResult.success(result);
+    }
 }

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

@@ -77,6 +77,7 @@ public class ZhjqArticleServiceImpl implements IZhjqArticleService {
     @Override
     public int updateZhjqArticle(ZhjqArticle zhjqArticle) {
         zhjqArticle.setJournalismContent(StringUtils.space2nbsp(zhjqArticle.getJournalismContent()));
+        zhjqArticle.setImg(zhjqArticle.getImg().replace(configService.selectConfigByKey("server_url"),""));
         return zhjqArticleMapper.updateZhjqArticle(zhjqArticle);
     }
 

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

@@ -3,13 +3,18 @@ package com.zhjq.service.imp;
 import java.util.List;
 
 import com.zhjq.common.utils.DateUtils;
+import com.zhjq.common.utils.StringUtils;
+import com.zhjq.domain.ZhjqArticle;
 import com.zhjq.domain.ZhjqScenery;
 import com.zhjq.mapper.ZhjqSceneryMapper;
+import com.zhjq.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zhjq.service.IZhjqSceneryService;
 
+import javax.annotation.Resource;
+
 /**
  * 景点管理Service业务层处理
  *
@@ -18,7 +23,11 @@ import com.zhjq.service.IZhjqSceneryService;
  */
 @Service
 public class ZhjqSceneryServiceImpl implements IZhjqSceneryService {
-    @Autowired
+
+    @Resource
+    private ISysConfigService configService;
+
+    @Resource
     private ZhjqSceneryMapper zhjqSceneryMapper;
 
     /**
@@ -29,7 +38,11 @@ public class ZhjqSceneryServiceImpl implements IZhjqSceneryService {
      */
     @Override
     public ZhjqScenery selectZhjqSceneryById(Long id) {
-        return zhjqSceneryMapper.selectZhjqSceneryById(id);
+        ZhjqScenery zhjqScenery = zhjqSceneryMapper.selectZhjqSceneryById(id);
+        if(StringUtils.isNotEmpty(zhjqScenery.getSceneryUrl())) {
+            zhjqScenery.setSceneryUrl(configService.selectConfigByKey("server_url") + zhjqScenery.getSceneryUrl());
+        }
+        return zhjqScenery;
     }
 
     /**
@@ -40,7 +53,13 @@ public class ZhjqSceneryServiceImpl implements IZhjqSceneryService {
      */
     @Override
     public List<ZhjqScenery> selectZhjqSceneryList(ZhjqScenery zhjqScenery) {
-        return zhjqSceneryMapper.selectZhjqSceneryList(zhjqScenery);
+        List<ZhjqScenery> zhjqSceneries = zhjqSceneryMapper.selectZhjqSceneryList(zhjqScenery);
+        for (ZhjqScenery a : zhjqSceneries) {
+            if(StringUtils.isNotEmpty(a.getSceneryUrl())){
+                a.setSceneryUrl(configService.selectConfigByKey("server_url") + a.getSceneryUrl());
+            }
+        }
+        return zhjqSceneries;
     }
 
     /**
@@ -52,6 +71,7 @@ public class ZhjqSceneryServiceImpl implements IZhjqSceneryService {
     @Override
     public int insertZhjqScenery(ZhjqScenery zhjqScenery) {
         zhjqScenery.setCreateTime(DateUtils.getNowDate());
+        zhjqScenery.setContent(StringUtils.space2nbsp(zhjqScenery.getContent()));
         return zhjqSceneryMapper.insertZhjqScenery(zhjqScenery);
     }
 
@@ -64,6 +84,8 @@ public class ZhjqSceneryServiceImpl implements IZhjqSceneryService {
     @Override
     public int updateZhjqScenery(ZhjqScenery zhjqScenery) {
         zhjqScenery.setUpdateTime(DateUtils.getNowDate());
+        zhjqScenery.setContent(StringUtils.space2nbsp(zhjqScenery.getContent()));
+        zhjqScenery.setSceneryUrl(zhjqScenery.getSceneryUrl().replace(configService.selectConfigByKey("server_url"),""));
         return zhjqSceneryMapper.updateZhjqScenery(zhjqScenery);
     }
 

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

@@ -89,6 +89,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="journalismName != null">#{journalismName},</if>
             <if test="intro != null">#{intro},</if>
+            <if test="img != null">#{img},</if>
             <if test="journalismContent != null">#{journalismContent},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="sort != null">#{sort},</if>

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

@@ -71,95 +71,49 @@
     <insert id="insertZhjqScenery" parameterType="ZhjqScenery">
         insert into zhjq_scenery
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,
-            </if>
-            <if test="sceneryName != null">scenery_name,
-            </if>
-            <if test="sceneryUrl != null">scenery_url,
-            </if>
-            <if test="content != null">content,
-            </if>
-            <if test="createBy != null">create_by,
-            </if>
-            <if test="createName != null">create_name,
-            </if>
-            <if test="createTime != null">create_time,
-            </if>
-            <if test="updateBy != null">update_by,
-            </if>
-            <if test="updateName != null">update_name,
-            </if>
-            <if test="updateTime != null">update_time,
-            </if>
-            <if test="longitude != null">longitude,
-            </if>
-            <if test="latitude != null">latitude,
-            </if>
+            <if test="id != null">id,</if>
+            <if test="sceneryName != null">scenery_name,</if>
+            <if test="sceneryUrl != null">scenery_url,</if>
+            <if test="content != null">content,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createName != null">create_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateName != null">update_name,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},
-            </if>
-            <if test="sceneryName != null">#{sceneryName},
-            </if>
-            <if test="sceneryUrl != null">#{sceneryUrl},
-            </if>
-            <if test="content != null">#{content},
-            </if>
-            <if test="createBy != null">#{createBy},
-            </if>
-            <if test="createName != null">#{createName},
-            </if>
-            <if test="createTime != null">#{createTime},
-            </if>
-            <if test="updateBy != null">#{updateBy},
-            </if>
-            <if test="updateName != null">#{updateName},
-            </if>
-            <if test="updateTime != null">#{updateTime},
-            </if>
-            <if test="longitude != null">#{longitude},
-            </if>
-            <if test="latitude != null">#{latitude},
-            </if>
+            <if test="id != null">#{id},</if>
+            <if test="sceneryName != null">#{sceneryName},</if>
+            <if test="sceneryUrl != null">#{sceneryUrl},</if>
+            <if test="content != null">#{content},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createName != null">#{createName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateName != null">#{updateName},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
         </trim>
     </insert>
 
     <update id="updateZhjqScenery" parameterType="ZhjqScenery">
         update zhjq_scenery
         <trim prefix="SET" suffixOverrides=",">
-            <if test="sceneryName != null">scenery_name =
-                #{sceneryName},
-            </if>
-            <if test="sceneryUrl != null">scenery_url =
-                #{sceneryUrl},
-            </if>
-            <if test="content != null">content =
-                #{content},
-            </if>
-            <if test="createBy != null">create_by =
-                #{createBy},
-            </if>
-            <if test="createName != null">create_name =
-                #{createName},
-            </if>
-            <if test="createTime != null">create_time =
-                #{createTime},
-            </if>
-            <if test="updateBy != null">update_by =
-                #{updateBy},
-            </if>
-            <if test="updateName != null">update_name =
-                #{updateName},
-            </if>
-            <if test="updateTime != null">update_time =
-                #{updateTime},
-            </if>
-            <if test="longitude != null">longitude =
-                #{longitude},
-            </if>
-            <if test="latitude != null">latitude =
-                #{latitude},
-            </if>
+            <if test="sceneryName != null">scenery_name = #{sceneryName},</if>
+            <if test="sceneryUrl != null">scenery_url = #{sceneryUrl},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createName != null">create_name = #{createName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateName != null">update_name = #{updateName},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -101,7 +101,7 @@
     />
 
     <!-- 添加或修改景点管理对话框 -->
-    <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="sceneryName">
           <el-input v-model="form.sceneryName" placeholder="请输入景点名称" maxlength="25"/>
@@ -112,6 +112,9 @@
         <el-form-item label="纬度" prop="latitude">
           <el-input v-model="form.latitude" placeholder="请输入纬度"/>
         </el-form-item>
+        <el-form-item label="图片" prop="img">
+          <file-upload v-model="form.sceneryUrl" :limit="1" :file-type="['png','jpg','jpeg']" :file-size="10"/>
+        </el-form-item>
         <el-form-item label="景点内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>