chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

帮助中心

Browse Source
This commit is contained in:
SjS 2025-03-28 16:21:17 +08:00
parent 5b56c1f1ce
commit 929d16c25b
15 changed files with 119 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.bst.article.domain;
public class ArticleVO {
public class ArticleVO extends Article {
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java
View File

@ -71,4 +71,6 @@ public interface ArticleMapper
* @return 结果
*/
public int deleteArticleByIds(Long[] ids);
public ArticleVO selectChildrenByiId(Long id);
}

5
ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml
View File

@ -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=",">

2
ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java
View File

@ -60,4 +60,6 @@ public interface ArticleService
* @return 结果
*/
public int deleteArticleById(Long id);
public ArticleVO selectChildrenByCategoryId(Long id);
}

5
ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java
View File

@ -116,4 +116,9 @@ public class ArticleServiceImpl implements ArticleService
{
return articleMapper.deleteArticleById(id);
}
@Override
public ArticleVO selectChildrenByCategoryId(Long id) {
return articleMapper.selectChildrenByiId(id);
}
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java
View File

@ -1,4 +1,6 @@
package com.ruoyi.bst.articleCategory.domain;
public class ArticleCategoryQuery extends ArticleCategory {
}

16
ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java
View File

@ -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);
}
/**
* 查询文章分类列表
*

4
ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java
View File

@ -52,4 +52,8 @@ public class Fault extends BaseEntity
@ApiModelProperty("用户id")
private Long userId;
@Excel(name = "是否处理")
@ApiModelProperty("是否处理")
private String handle;
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java
View File

@ -14,4 +14,6 @@ public class FaultVO extends Fault{
@ApiModelProperty("故障原因")
private String faultSite;
@ApiModelProperty("车牌号")
private String vehicleNum;
}

16
ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java Normal file
View File

@ -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;
}

7
ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java
View File

@ -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;

6
ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
View File

@ -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>

4
ruoyi-web/src/main/java/com/ruoyi/web/app/AppArticleController.java
View File

@ -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){

30
ruoyi-web/src/main/java/com/ruoyi/web/app/AppAtricleCategoryController.java
View File

@ -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);
}
}

36
ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
View File

@ -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);
}
}