From 929d16c25bbe1982b227669e3195ea20e7bb8cdd Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Fri, 28 Mar 2025 16:21:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/bst/article/domain/ArticleVO.java   |  2 +-
 .../bst/article/mapper/ArticleMapper.java     |  2 ++
 .../bst/article/mapper/ArticleMapper.xml      |  5 +++
 .../bst/article/service/ArticleService.java   |  2 ++
 .../service/impl/ArticleServiceImpl.java      |  5 +++
 .../domain/ArticleCategoryQuery.java          |  2 ++
 .../impl/ArticleCategoryServiceImpl.java      | 16 ++++++++-
 .../com/ruoyi/bst/fault/domain/Fault.java     |  4 +++
 .../com/ruoyi/bst/fault/domain/FaultVO.java   |  2 ++
 .../fault/domain/enums/FaultHandleStatus.java | 16 +++++++++
 .../bst/fault/domain/enums/FaultStatus.java   |  7 ++--
 .../ruoyi/bst/fault/mapper/FaultMapper.xml    |  6 +++-
 .../ruoyi/web/app/AppArticleController.java   |  4 +--
 .../web/app/AppAtricleCategoryController.java | 30 +++++++++++++---
 .../com/ruoyi/web/app/AppFaultController.java | 36 ++++++++++++++-----
 15 files changed, 119 insertions(+), 20 deletions(-)
 create mode 100644 ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java
index f4ef96f..9a84346 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java
@@ -1,4 +1,4 @@
 package com.ruoyi.bst.article.domain;
 
-public class ArticleVO {
+public class ArticleVO extends Article {
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
index 8b9a4aa..3b300c1 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
@@ -71,4 +71,6 @@ public interface ArticleMapper
      * @return 结果
      */
     public int deleteArticleByIds(Long[] ids);
+
+    public ArticleVO selectChildrenByiId(Long id);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
index bfb38f2..6255069 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
@@ -47,6 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectChildrenByiId" resultType="com.ruoyi.bst.article.domain.ArticleVO">
+        <include refid="selectArticleVo"/>
+        where id = #{categoryId}
+    </select>
+
     <insert id="insertArticle" parameterType="Article" useGeneratedKeys="true" keyProperty="id">
         insert into bst_article
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
index bad4654..a9a08d7 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
@@ -60,4 +60,6 @@ public interface ArticleService
      * @return 结果
      */
     public int deleteArticleById(Long id);
+
+    public ArticleVO selectChildrenByCategoryId(Long id);
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
index 10f1b22..df09564 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
@@ -116,4 +116,9 @@ public class ArticleServiceImpl implements ArticleService
     {
         return articleMapper.deleteArticleById(id);
     }
+
+    @Override
+    public ArticleVO selectChildrenByCategoryId(Long id) {
+        return articleMapper.selectChildrenByiId(id);
+    }
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java
index fb91e78..2eabd18 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java
@@ -1,4 +1,6 @@
 package com.ruoyi.bst.articleCategory.domain;
 
 public class ArticleCategoryQuery extends ArticleCategory {
+
+
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
index f7ea835..3c438ac 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
@@ -2,10 +2,14 @@ package com.ruoyi.bst.articleCategory.service.impl;
 
 import java.util.*;
 
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.bst.area.domain.AreaQuery;
+import com.ruoyi.bst.area.domain.AreaVO;
 import com.ruoyi.bst.device.utils.DeviceUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServiceUtil;
+import com.ruoyi.common.utils.collection.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.bst.articleCategory.mapper.ArticleCategoryMapper;
@@ -36,9 +40,19 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService
     @Override
     public ArticleCategoryVO selectArticleCategoryById(Long id)
     {
-        return articleCategoryMapper.selectArticleCategoryById(id);
+        if (id == null) {
+            return null;
+        }
+        ArticleCategoryQuery query = new ArticleCategoryQuery();
+        query.setId(id);
+        return this.selectOne(query);
     }
 
+    public ArticleCategoryVO selectOne(ArticleCategoryQuery query){
+            PageHelper.startPage(1, 1);
+            List<ArticleCategoryVO> list = articleCategoryMapper.selectArticleCategoryList(query);
+            return CollectionUtils.firstElement(list);
+    }
     /**
      * 查询文章分类列表
      *
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
index ba2ad32..110db12 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
@@ -52,4 +52,8 @@ public class Fault extends BaseEntity
     @ApiModelProperty("用户id")
     private Long userId;
 
+    @Excel(name = "是否处理")
+    @ApiModelProperty("是否处理")
+    private String handle;
+
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
index c78950c..c126115 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
@@ -14,4 +14,6 @@ public class FaultVO extends Fault{
     @ApiModelProperty("故障原因")
     private String faultSite;
 
+    @ApiModelProperty("车牌号")
+    private String vehicleNum;
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java
new file mode 100644
index 0000000..c53cea0
--- /dev/null
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java
@@ -0,0 +1,16 @@
+package com.ruoyi.bst.fault.domain.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FaultHandleStatus {
+
+    REJECTED("0", "驳回"),
+    DO("1", "处理");
+
+    private final String code;
+    private final String name;
+
+}
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java
index 32c79f1..f92cb00 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java
@@ -7,9 +7,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FaultStatus {
 
-    STORAGE("0", "已驳回"),
-    AVAILABLE("1", "已提交"),
-    RESERVED("2", "维修中");
+    REJECTED("0", "已驳回"),
+    PENGDING("1", "待处理"),
+    REPAIRING("2", "维修中"),
+    COMPLETED("3", "已完成");
 
     private final String code;
     private final String name;
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
index 2ec89f5..9aa7200 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
@@ -18,7 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bf.appeal_status,
             bf.create_time,
             bf.order_end_time,
-            bf.user_id
+            bf.user_id,
+            bf.vehicle_num
         from bst_fault bf
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFaultVo"/>
         where id = #{id}
     </select>
+
     <select id="selectFaultByUserId" resultType="com.ruoyi.bst.fault.domain.FaultVO">
         select
             order_end_time,
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealStatus != null and appealStatus != ''">appeal_status,</if>
             <if test="createTime != null">create_time,</if>
             <if test="userId != null">user_id,</if>
+            <if test="vehicle_num != null">vehicle_num,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userName != null and userName != ''">#{userName},</if>
@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="appealStatus != null and appealStatus != ''">#{appealStatus},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="vehicle_num != null">#{vehicleNum},</if>
          </trim>
     </insert>
 
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppArticleController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppArticleController.java
index b3bab96..4a9205e 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppArticleController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppArticleController.java
@@ -24,8 +24,8 @@ public class AppArticleController extends BaseController {
     private ArticleService articleService;
 
 
-    @ApiOperation("查看文章信息")
-    @GetMapping("/detail")
+    @ApiOperation("查看文章")
+    @GetMapping
     @Anonymous
     public AjaxResult getCategoryList(ArticleQuery query) {
         if(query.getId() == null){
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java
index 41363a0..aefe6e4 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java
@@ -1,17 +1,24 @@
 package com.ruoyi.web.app;
 
+import com.ruoyi.bst.article.domain.ArticleVO;
+import com.ruoyi.bst.article.service.ArticleService;
 import com.ruoyi.bst.articleCategory.domain.ArticleCategoryQuery;
+import com.ruoyi.bst.articleCategory.domain.ArticleCategoryVO;
 import com.ruoyi.bst.articleCategory.domain.enums.ArticleCategoryStatus;
 import com.ruoyi.bst.articleCategory.service.ArticleCategoryService;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 @RestController
 @RequestMapping("/app/articleCategory")
@@ -20,11 +27,26 @@ public class AppAtricleCategoryController extends BaseController {
     @Autowired
     private ArticleCategoryService articleCategoryService;
 
-    @ApiOperation("展示分类信息")
-    @GetMapping("/list")
+    @Autowired
+    private ArticleService articleService;
+
+    @ApiOperation("帮助中心")
+    @GetMapping
     @Anonymous
-    public AjaxResult getCategoryList(ArticleCategoryQuery query) {
+    public TableDataInfo getCategoryList(ArticleCategoryQuery query) {
+        startPage();
         query.setCategoryStatus(ArticleCategoryStatus.ENABLED.getCode());
-        return success(articleCategoryService.selectArticleCategoryList(query));
+
+        //查询分类的文章
+        List<ArticleCategoryVO> list = articleCategoryService.selectArticleCategoryList(query);
+        list.forEach(articleCategoryVO -> {
+            ArticleVO children = articleService.selectChildrenByCategoryId(articleCategoryVO.getId());
+            List<ArticleVO> childrenList = new ArrayList<>();
+            if (children != null) {
+                childrenList.add(children);
+            }
+            articleCategoryVO.setChildren(childrenList);
+        });
+        return getDataTable(list);
     }
 }
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
index e3f585b..7068a4d 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
@@ -5,10 +5,13 @@ import com.ruoyi.bst.device.service.DeviceService;
 import com.ruoyi.bst.fault.domain.Fault;
 import com.ruoyi.bst.fault.domain.FaultQuery;
 import com.ruoyi.bst.fault.domain.FaultVO;
+import com.ruoyi.bst.fault.domain.enums.FaultHandleStatus;
+import com.ruoyi.bst.fault.domain.enums.FaultStatus;
 import com.ruoyi.bst.fault.service.FaultService;
 import com.ruoyi.bst.order.service.OrderService;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -45,28 +48,45 @@ public class AppFaultController extends BaseController {
     }
 
 
+    @PutMapping
+    public AjaxResult update(@RequestBody Fault fault) {
+        FaultVO faultVO = faultService.selectFaultById(fault.getId());
+        if (faultVO.getAppealStatus().equals(FaultStatus.PENGDING.getCode()) && fault.getHandle().equals(FaultHandleStatus.REJECTED.getCode())) {
+            faultVO.setAppealStatus(FaultStatus.REJECTED.getCode());
+        }else
+        if (faultVO.getAppealStatus().equals(FaultStatus.PENGDING.getCode()) && fault.getHandle().equals(FaultHandleStatus.DO.getCode())) {
+            faultVO.setAppealStatus(FaultStatus.REPAIRING.getCode());
+        }else
+        if (faultVO.getAppealStatus().equals(FaultStatus.REPAIRING.getCode()) && fault.getHandle().equals(FaultHandleStatus.DO.getCode())) {
+            faultVO.setAppealStatus(FaultStatus.COMPLETED.getCode());
+        }
+        faultService.updateFault(faultVO);
+        return success();
+    }
+
+    /**
+     * 历史申报查询
+     * @param query
+     * @return
+     */
     @GetMapping
-    public AjaxResult get(FaultQuery query) {
+    public TableDataInfo get(FaultQuery query) {
+        startPage();
         query.setUserId(getUserId());
         List<FaultVO> list = faultService.selectFaultList(query);
         List<FaultVO> validList = new ArrayList<>();
 
         list.forEach(faultVO -> {
             DeviceVO deviceVO = deviceService.selectDeviceBySn(faultVO.getVehicleCode());
+            // 查询的设备不能为空
             if (deviceVO == null){
                 return;
             }
             Long orderId = deviceVO.getOrderId();
-            if (orderId  == null) {
-                return;
-            }
             LocalDateTime orderEndTime = orderService.selectOrderById(orderId).getEndTime();
-            if (orderEndTime == null) {
-                return;
-            }
             faultVO.setOrderEndTime(orderEndTime);
             validList.add(faultVO);
         });
-        return success(validList);
+        return getDataTable(validList);
         }
     }