修改文章管理、栏目管理

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

@@ -92,9 +92,9 @@ public class ZhjqArticleController extends BaseController {
     /**
      * 小程序获取文章管理详细信息
      */
-    @GetMapping(value = "columnList/{columnId}")
-    public AjaxResult columnList(@PathVariable("columnId") Long columnId) {
-        return success(zhjqArticleService.selectZhjqArticleByColumnId(columnId));
+    @GetMapping(value = "getArticleById/{id}")
+    public AjaxResult columnList(@PathVariable("id") Long id) {
+        return success(zhjqArticleService.selectZhjqArticleById(id));
     }
 
     /**
@@ -103,9 +103,8 @@ public class ZhjqArticleController extends BaseController {
     @GetMapping("/articleAppList")
     public AjaxResult getArticleAppList(
             @RequestParam("columnId") Long columnId,
-            @RequestParam(value = "sort", required = false) String sort,
             @RequestParam(value = "limit", required = false, defaultValue = "10") int limit) {
-        List<ZhjqArticle> result = zhjqArticleService.getArticleAppList(columnId, sort, limit);
+        List<ZhjqArticle> result = zhjqArticleService.getArticleAppList(columnId, limit);
         return AjaxResult.success(result);
     }
 

zhjq-business/src/main/java/com/zhjq/mapper/ZhjqArticleMapper.java

@@ -61,9 +61,5 @@ public interface ZhjqArticleMapper {
      */
     public int deleteZhjqArticleByIds(Long[] ids);
 
-    public List<ZhjqArticle> selectZhjqArticleByColumnId(Long columnId);
-
-    List<ZhjqArticle> getArticleAppList(@Param("columnId") Long columnId,
-                                        @Param("sort") String sort,
-                                        @Param("limit") int limit);
+    List<ZhjqArticle> getArticleAppList(@Param("columnId") Long columnId, @Param("limit") int limit);
 }

zhjq-business/src/main/java/com/zhjq/service/IZhjqArticleService.java

@@ -60,7 +60,5 @@ public interface IZhjqArticleService {
      */
     public int deleteZhjqArticleById(Long id);
 
-    public List<ZhjqArticle> selectZhjqArticleByColumnId(Long columnId);
-
-    List<ZhjqArticle> getArticleAppList(Long columnId, String sort, int limit);
+    List<ZhjqArticle> getArticleAppList(Long columnId, int limit);
 }

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

@@ -89,12 +89,7 @@ public class ZhjqArticleServiceImpl implements IZhjqArticleService {
     }
 
     @Override
-    public List<ZhjqArticle> selectZhjqArticleByColumnId(Long columnId) {
-        return zhjqArticleMapper.selectZhjqArticleByColumnId(columnId);
-    }
-
-    @Override
-    public List<ZhjqArticle> getArticleAppList(Long columnId, String sort, int limit) {
-        return zhjqArticleMapper.getArticleAppList(columnId, sort, limit);
+    public List<ZhjqArticle> getArticleAppList(Long columnId, int limit) {
+        return zhjqArticleMapper.getArticleAppList(columnId, limit);
     }
 }

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

@@ -47,20 +47,24 @@
 
     <select id="selectZhjqArticleById" 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.id = #{id}
-        GROUP BY a.id
+        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.id = #{id}
+        GROUP BY
+            a.id
     </select>
 
     <insert id="insertZhjqArticle" parameterType="ZhjqArticle" useGeneratedKeys="true"
@@ -160,28 +164,23 @@
 
     <select id="getArticleAppList" 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_id AS columnId,
-        b.column_name AS columnName
+            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
+            zhjq_article a
         LEFT JOIN
-        zhjq_column b ON a.column_id = b.column_id
+            zhjq_column b ON a.column_id = b.column_id
         WHERE
-        a.column_id = #{columnId}
-        <if test="sort != null and sort != ''">
-            ORDER BY #{sort} DESC
-        </if>
-        <if test="sort == null or sort == ''">
-            ORDER BY a.create_time DESC
-        </if>
+            a.column_id = #{columnId}
+        ORDER BY sort DESC, a.create_time DESC
         <if test="limit != null and limit != ''">
             LIMIT #{limit}
         </if>

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

@@ -229,7 +229,9 @@ export default {
       },
       value: 999,
       // 表单参数
-      form: {},
+      form: {
+        columnId: null
+      },
       defaultProps: {
         children: "children",
         label: "label"
@@ -327,6 +329,7 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.columnId = data.id;
+      this.form.columnId = data.id;
       this.handleQuery();
     },
     /** 查询文章管理全部列表 */
@@ -381,6 +384,7 @@ export default {
       this.value = 999;
       this.open = true;
       this.title = "添加文章管理";
+      this.form.columnId = this.queryParams.columnId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

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

@@ -44,30 +44,6 @@
             >新增
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="success"
-                plain
-                icon="el-icon-edit"
-                size="mini"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['system:column:edit']"
-            >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['system:column:remove']"
-            >删除
-            </el-button>
-          </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>