From e50703034dfac1b5ae922b5636e9088b02b7f5d0 Mon Sep 17 00:00:00 2001 From: SjS Date: Wed, 26 Mar 2025 18:15:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fault/service/impl/FaultServiceImpl.java | 4 ++-- .../com/ruoyi/web/app/AppFaultController.java | 22 +++++++++++++++++++ .../com/ruoyi/web/bst/FaultController.java | 6 ++--- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java index 2881b91..befe8bb 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java @@ -55,8 +55,8 @@ public class FaultServiceImpl implements FaultService @Override public int insertFault(Fault fault) { - fault.setCreateTime(DateUtils.getNowDate()); - return faultMapper.insertFault(fault); + fault.setCreateTime(DateUtils.getNowDate()); + return faultMapper.insertFault(fault); } /** 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 new file mode 100644 index 0000000..de0f3e0 --- /dev/null +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java @@ -0,0 +1,22 @@ +package com.ruoyi.web.app; + +import com.ruoyi.bst.fault.service.FaultService; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("app/fault") +public class AppFaultController { + + @Autowired + private FaultService faultService; + //TODO : 前台用户查询自己提交的申报信息 + @GetMapping("/{id}") + public AjaxResult get(@PathVariable Long id) { + + } +} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java index af413f7..61aa402 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java @@ -67,7 +67,7 @@ public class FaultController extends BaseController } /** - * 新增故障 + * 新增故障信息 */ @PreAuthorize("@ss.hasPermi('bst:fault:add')") @Log(title = "故障", businessType = BusinessType.INSERT) @@ -78,7 +78,7 @@ public class FaultController extends BaseController } /** - * 修改故障 + * 修改故障信息 */ @PreAuthorize("@ss.hasPermi('bst:fault:edit')") @Log(title = "故障", businessType = BusinessType.UPDATE) @@ -89,7 +89,7 @@ public class FaultController extends BaseController } /** - * 删除故障 + * 删除故障信息 */ @PreAuthorize("@ss.hasPermi('bst:fault:remove')") @Log(title = "故障", businessType = BusinessType.DELETE) From c4978f239af32e5c59fb182d05dd73d6b3d380eb Mon Sep 17 00:00:00 2001 From: sen <1060051436@qq.com> Date: Thu, 27 Mar 2025 07:32:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=85=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/bst/fault/domain/Fault.java | 4 +++- .../com/ruoyi/bst/fault/domain/FaultQuery.java | 3 ++- .../com/ruoyi/web/app/AppFaultController.java | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) 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 ddccd9d..c8270d9 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 @@ -5,6 +5,8 @@ import lombok.Data; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; + /** * 故障对象 bst_fault * @@ -36,7 +38,7 @@ public class Fault extends BaseEntity @Excel(name = "故障部位") @ApiModelProperty("故障部位") - private String faultSite; + private List faultSite; @Excel(name = "故障详情") @ApiModelProperty("故障详情") diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultQuery.java index b31251b..2a016fb 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultQuery.java @@ -3,13 +3,14 @@ package com.ruoyi.bst.fault.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; @Data public class FaultQuery extends Fault{ @ApiModelProperty("故障部位") - private String faultSite; + private List faultSite; @ApiModelProperty("报修进度") private String appealStatus; 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 de0f3e0..3ed28e3 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 @@ -1,22 +1,33 @@ package com.ruoyi.web.app; +import com.ruoyi.bst.fault.domain.FaultVO; import com.ruoyi.bst.fault.service.FaultService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 用户查询自己提交的故障信息 + */ @RestController -@RequestMapping("app/fault") +@RequestMapping("/app/fault") public class AppFaultController { @Autowired private FaultService faultService; - //TODO : 前台用户查询自己提交的申报信息 + @GetMapping("/{id}") public AjaxResult get(@PathVariable Long id) { - + Long userId = SecurityUtils.getLoginUser().getUserId(); + // 当用户查询的故障信息是自己的或当前用户是超级管理员时 + if (userId.equals(id)|| userId == 1){ + FaultVO faultVO = faultService.selectFaultById(id); + return AjaxResult.success(faultVO); + } + return AjaxResult.error("您的查询不合法！"); } }