From aa3eea7da183ea4550589ce02245376bf51a9d80 Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 24 Jun 2025 18:37:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E4=BC=98=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=E5=92=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DmsBillsInspectInstanceServiceImpl、DmsBillsLubeInstanceServiceImpl 和 DmsBillsMaintInstanceServiceImpl 中添加更新失败异常处理 - 将 DmsRecordInspect及相关类的命名从英文改为中文，如 dmsRecordInspect改为 点巡检历史记录 - 更新 DmsRecordInspectController 中的路由地址和权限检查 --- .../DmsRecordInspectController.java | 42 +++++++++---------- .../dromara/dms/domain/DmsRecordInspect.java | 3 +- .../dms/domain/bo/DmsRecordInspectBo.java | 2 +- .../dms/mapper/DmsRecordInspectMapper.java | 2 +- .../DmsBillsInspectInstanceServiceImpl.java | 4 ++ .../impl/DmsBillsLubeInstanceServiceImpl.java | 4 ++ .../DmsBillsMaintInstanceServiceImpl.java | 6 ++- .../impl/DmsRecordInspectServiceImpl.java | 24 +++++------ 8 files changed, 50 insertions(+), 37 deletions(-) diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java index 36956b8..d092ebe 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java @@ -23,8 +23,8 @@ import org.dromara.dms.service.IDmsRecordInspectService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** - * dmsRecordInspect - * 前端访问路由地址为:/dms/recordInspect + * 点巡检历史记录 + * 前端访问路由地址为:/dms/dmsRecordInspect * * @author zch * @date 2025-06-24 @@ -32,37 +32,37 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/recordInspect") +@RequestMapping("/dmsRecordInspect") public class DmsRecordInspectController extends BaseController { private final IDmsRecordInspectService dmsRecordInspectService; /** - * 查询dmsRecordInspect列表 + * 查询点巡检历史记录列表 */ - @SaCheckPermission("dms:recordInspect:list") + @SaCheckPermission("dms:dmsRecordInspect:list") @GetMapping("/list") public TableDataInfo list(DmsRecordInspectBo bo, PageQuery pageQuery) { return dmsRecordInspectService.queryPageList(bo, pageQuery); } /** - * 导出dmsRecordInspect列表 + * 导出点巡检历史记录列表 */ - @SaCheckPermission("dms:recordInspect:export") - @Log(title = "dmsRecordInspect", businessType = BusinessType.EXPORT) + @SaCheckPermission("dms:dmsRecordInspect:export") + @Log(title = "点巡检历史记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DmsRecordInspectBo bo, HttpServletResponse response) { List list = dmsRecordInspectService.queryList(bo); - ExcelUtil.exportExcel(list, "dmsRecordInspect", DmsRecordInspectVo.class, response); + ExcelUtil.exportExcel(list, "点巡检历史记录", DmsRecordInspectVo.class, response); } /** - * 获取dmsRecordInspect详细信息 + * 获取点巡检历史记录详细信息 * * @param recordInspectId 主键 */ - @SaCheckPermission("dms:recordInspect:query") + @SaCheckPermission("dms:dmsRecordInspect:query") @GetMapping("/{recordInspectId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long recordInspectId) { @@ -70,10 +70,10 @@ public class DmsRecordInspectController extends BaseController { } /** - * 新增dmsRecordInspect + * 新增点巡检历史记录 */ - @SaCheckPermission("dms:recordInspect:add") - @Log(title = "dmsRecordInspect", businessType = BusinessType.INSERT) + @SaCheckPermission("dms:dmsRecordInspect:add") + @Log(title = "点巡检历史记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody DmsRecordInspectBo bo) { @@ -81,10 +81,10 @@ public class DmsRecordInspectController extends BaseController { } /** - * 修改dmsRecordInspect + * 修改点巡检历史记录 */ - @SaCheckPermission("dms:recordInspect:edit") - @Log(title = "dmsRecordInspect", businessType = BusinessType.UPDATE) + @SaCheckPermission("dms:dmsRecordInspect:edit") + @Log(title = "点巡检历史记录", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody DmsRecordInspectBo bo) { @@ -92,12 +92,12 @@ public class DmsRecordInspectController extends BaseController { } /** - * 删除dmsRecordInspect + * 删除点巡检历史记录 * * @param recordInspectIds 主键串 */ - @SaCheckPermission("dms:recordInspect:remove") - @Log(title = "dmsRecordInspect", businessType = BusinessType.DELETE) + @SaCheckPermission("dms:dmsRecordInspect:remove") + @Log(title = "点巡检历史记录", businessType = BusinessType.DELETE) @DeleteMapping("/{recordInspectIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] recordInspectIds) { @@ -106,7 +106,7 @@ public class DmsRecordInspectController extends BaseController { /** - * 下拉框查询dmsRecordInspect列表 + * 下拉框查询点巡检历史记录列表 */ @GetMapping("/getDmsRecordInspectList") diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java index 0202bec..3839adf 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; /** - * dmsRecordInspect对象 dms_record_inspect + * 点巡检历史记录对象 dms_record_inspect * * @author zch * @date 2025-06-24 @@ -26,6 +26,7 @@ public class DmsRecordInspect extends TenantEntity { /** * 主键标识 */ + @TableId(value = "record_inspect_id", type = IdType.AUTO) private Long recordInspectId; /** diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java index 0c6d9ff..b0ede97 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java @@ -12,7 +12,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; /** - * dmsRecordInspect业务对象 dms_record_inspect + * 点巡检历史记录业务对象 dms_record_inspect * * @author zch * @date 2025-06-24 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java index e856470..c0eec9e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java @@ -5,7 +5,7 @@ import org.dromara.dms.domain.vo.DmsRecordInspectVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** - * dmsRecordInspectMapper接口 + * 点巡检历史记录Mapper接口 * * @author zch * @date 2025-06-24 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java index c101c08..131dd1a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -147,6 +147,10 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta public DmsBillsInspectInstanceVo updateByBo(DmsBillsInspectInstanceBo bo) { DmsBillsInspectInstance update = MapstructUtils.convert(bo, DmsBillsInspectInstance.class); validEntityBeforeSave(update); + boolean flag = baseMapper.updateById(update) > 0; + if (!flag) { + throw new ServiceException("更新点巡检工单失败"); + } return MapstructUtils.convert(update, DmsBillsInspectInstanceVo.class); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java index a239423..7d8272e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java @@ -157,6 +157,10 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer public DmsBillsLubeInstanceVo updateByBo(DmsBillsLubeInstanceBo bo) { DmsBillsLubeInstance update = MapstructUtils.convert(bo, DmsBillsLubeInstance.class); validEntityBeforeSave(update); + boolean flag = baseMapper.updateById(update) > 0; + if (!flag) { + throw new ServiceException("更新润滑工单失败"); + } return MapstructUtils.convert(update, DmsBillsLubeInstanceVo.class); } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java index 68a4c0b..6f66e85 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java @@ -159,6 +159,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS public DmsBillsMaintInstanceVo updateByBo(DmsBillsMaintInstanceBo bo) { DmsBillsMaintInstance update = MapstructUtils.convert(bo, DmsBillsMaintInstance.class); validEntityBeforeSave(update); + boolean flag = baseMapper.updateById(update) > 0; + if (!flag) { + throw new ServiceException("更新保养工单失败"); + } return MapstructUtils.convert(update, DmsBillsMaintInstanceVo.class); } @@ -352,7 +356,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS updateWorkFlow(dmsBillsMaintInstance, taskId); } catch (Exception e) { // 简单记录错误，不影响主流程 - log.error("异步更新保养工作流失败，getBillsMaintCode: {}, 错误: {}", + log.error("异步更新保养工作流失败，getBillsMaintCode: {}, 错误: {}", dmsBillsMaintInstance.getBillsMaintCode(), e.getMessage(), e); // 可以考虑记录到失败表，后续补偿处理 } diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java index e9c4b02..a8af89e 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Collection; /** - * dmsRecordInspectService业务层处理 + * 点巡检历史记录Service业务层处理 * * @author zch * @date 2025-06-24 @@ -33,10 +33,10 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { private final DmsRecordInspectMapper baseMapper; /** - * 查询dmsRecordInspect + * 查询点巡检历史记录 * * @param recordInspectId 主键 - * @return dmsRecordInspect + * @return 点巡检历史记录 */ @Override public DmsRecordInspectVo queryById(Long recordInspectId){ @@ -44,11 +44,11 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { } /** - * 分页查询dmsRecordInspect列表 + * 分页查询点巡检历史记录列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return dmsRecordInspect分页列表 + * @return 点巡检历史记录分页列表 */ @Override public TableDataInfo queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery) { @@ -58,10 +58,10 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { } /** - * 查询符合条件的dmsRecordInspect列表 + * 查询符合条件的点巡检历史记录列表 * * @param bo 查询条件 - * @return dmsRecordInspect列表 + * @return 点巡检历史记录列表 */ @Override public List queryList(DmsRecordInspectBo bo) { @@ -93,9 +93,9 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { } /** - * 新增dmsRecordInspect + * 新增点巡检历史记录 * - * @param bo dmsRecordInspect + * @param bo 点巡检历史记录 * @return 是否新增成功 */ @Override @@ -110,9 +110,9 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { } /** - * 修改dmsRecordInspect + * 修改点巡检历史记录 * - * @param bo dmsRecordInspect + * @param bo 点巡检历史记录 * @return 是否修改成功 */ @Override @@ -130,7 +130,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService { } /** - * 校验并批量删除dmsRecordInspect信息 + * 校验并批量删除点巡检历史记录信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验