xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(dms): 优化工单更新逻辑和记录命名

Browse Source 
- 在 DmsBillsInspectInstanceServiceImpl、DmsBillsLubeInstanceServiceImpl 和 DmsBillsMaintInstanceServiceImpl 中添加更新失败异常处理
- 将 DmsRecordInspect及相关类的命名从英文改为中文，如 dmsRecordInspect改为 点巡检历史记录
- 更新 DmsRecordInspectController 中的路由地址和权限检查
master
zch 2 days ago
parent 3f65e1fb7e
commit aa3eea7da1
8 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File

42
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsRecordInspectController.java
Unescape Escape View File

@ -23,8 +23,8 @@ import org.dromara.dms.service.IDmsRecordInspectService;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
/** /**
* dmsRecordInspect * 点巡检历史记录
* 前端访问路由地址为:/dms/recordInspect * 前端访问路由地址为:/dms/dmsRecordInspect
* *
* @author zch * @author zch
* @date 2025-06-24 * @date 2025-06-24
@ -32,37 +32,37 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/recordInspect") @RequestMapping("/dmsRecordInspect")
public class DmsRecordInspectController extends BaseController { public class DmsRecordInspectController extends BaseController {
private final IDmsRecordInspectService dmsRecordInspectService; private final IDmsRecordInspectService dmsRecordInspectService;
/** /**
* 查询dmsRecordInspect列表 * 查询点巡检历史记录列表
*/ */
@SaCheckPermission("dms:recordInspect:list") @SaCheckPermission("dms:dmsRecordInspect:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<DmsRecordInspectVo> list(DmsRecordInspectBo bo, PageQuery pageQuery) { public TableDataInfo<DmsRecordInspectVo> list(DmsRecordInspectBo bo, PageQuery pageQuery) {
return dmsRecordInspectService.queryPageList(bo, pageQuery); return dmsRecordInspectService.queryPageList(bo, pageQuery);
} }
/** /**
* 导出dmsRecordInspect列表 * 导出点巡检历史记录列表
*/ */
@SaCheckPermission("dms:recordInspect:export") @SaCheckPermission("dms:dmsRecordInspect:export")
@Log(title = "dmsRecordInspect", businessType = BusinessType.EXPORT) @Log(title = "点巡检历史记录", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(DmsRecordInspectBo bo, HttpServletResponse response) { public void export(DmsRecordInspectBo bo, HttpServletResponse response) {
List<DmsRecordInspectVo> list = dmsRecordInspectService.queryList(bo); List<DmsRecordInspectVo> list = dmsRecordInspectService.queryList(bo);
ExcelUtil.exportExcel(list, "dmsRecordInspect", DmsRecordInspectVo.class, response); ExcelUtil.exportExcel(list, "点巡检历史记录", DmsRecordInspectVo.class, response);
} }
/** /**
* 获取dmsRecordInspect详细信息 * 获取点巡检历史记录详细信息
* *
* @param recordInspectId 主键 * @param recordInspectId 主键
*/ */
@SaCheckPermission("dms:recordInspect:query") @SaCheckPermission("dms:dmsRecordInspect:query")
@GetMapping("/{recordInspectId}") @GetMapping("/{recordInspectId}")
public R<DmsRecordInspectVo> getInfo(@NotNull(message = "主键不能为空") public R<DmsRecordInspectVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long recordInspectId) { @PathVariable Long recordInspectId) {
@ -70,10 +70,10 @@ public class DmsRecordInspectController extends BaseController {
} }
/** /**
* 新增dmsRecordInspect * 新增点巡检历史记录
*/ */
@SaCheckPermission("dms:recordInspect:add") @SaCheckPermission("dms:dmsRecordInspect:add")
@Log(title = "dmsRecordInspect", businessType = BusinessType.INSERT) @Log(title = "点巡检历史记录", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsRecordInspectBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsRecordInspectBo bo) {
@ -81,10 +81,10 @@ public class DmsRecordInspectController extends BaseController {
} }
/** /**
* 修改dmsRecordInspect * 修改点巡检历史记录
*/ */
@SaCheckPermission("dms:recordInspect:edit") @SaCheckPermission("dms:dmsRecordInspect:edit")
@Log(title = "dmsRecordInspect", businessType = BusinessType.UPDATE) @Log(title = "点巡检历史记录", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsRecordInspectBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsRecordInspectBo bo) {
@ -92,12 +92,12 @@ public class DmsRecordInspectController extends BaseController {
} }
/** /**
* 删除dmsRecordInspect * 删除点巡检历史记录
* *
* @param recordInspectIds 主键串 * @param recordInspectIds 主键串
*/ */
@SaCheckPermission("dms:recordInspect:remove") @SaCheckPermission("dms:dmsRecordInspect:remove")
@Log(title = "dmsRecordInspect", businessType = BusinessType.DELETE) @Log(title = "点巡检历史记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordInspectIds}") @DeleteMapping("/{recordInspectIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] recordInspectIds) { @PathVariable Long[] recordInspectIds) {
@ -106,7 +106,7 @@ public class DmsRecordInspectController extends BaseController {
/** /**
* 下拉框查询dmsRecordInspect列表 * 下拉框查询点巡检历史记录列表
*/ */
@GetMapping("/getDmsRecordInspectList") @GetMapping("/getDmsRecordInspectList")

3
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordInspect.java
Unescape Escape View File

@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial; import java.io.Serial;
/** /**
* dmsRecordInspect对象 dms_record_inspect * 点巡检历史记录对象 dms_record_inspect
* *
* @author zch * @author zch
* @date 2025-06-24 * @date 2025-06-24
@ -26,6 +26,7 @@ public class DmsRecordInspect extends TenantEntity {
/** /**
* 主键标识 * 主键标识
*/ */
@TableId(value = "record_inspect_id", type = IdType.AUTO)
private Long recordInspectId; private Long recordInspectId;
/** /**

2
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsRecordInspectBo.java
Unescape Escape View File

@ -12,7 +12,7 @@ import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* dmsRecordInspect业务对象 dms_record_inspect * 点巡检历史记录业务对象 dms_record_inspect
* *
* @author zch * @author zch
* @date 2025-06-24 * @date 2025-06-24

2
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsRecordInspectMapper.java
Unescape Escape View File

@ -5,7 +5,7 @@ import org.dromara.dms.domain.vo.DmsRecordInspectVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/** /**
* dmsRecordInspectMapper接口 * 点巡检历史记录Mapper接口
* *
* @author zch * @author zch
* @date 2025-06-24 * @date 2025-06-24

4
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java
Unescape Escape View File

@ -147,6 +147,10 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
public DmsBillsInspectInstanceVo updateByBo(DmsBillsInspectInstanceBo bo) { public DmsBillsInspectInstanceVo updateByBo(DmsBillsInspectInstanceBo bo) {
DmsBillsInspectInstance update = MapstructUtils.convert(bo, DmsBillsInspectInstance.class); DmsBillsInspectInstance update = MapstructUtils.convert(bo, DmsBillsInspectInstance.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
boolean flag = baseMapper.updateById(update) > 0;
if (!flag) {
throw new ServiceException("更新点巡检工单失败");
}
return MapstructUtils.convert(update, DmsBillsInspectInstanceVo.class); return MapstructUtils.convert(update, DmsBillsInspectInstanceVo.class);
} }

4
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java
Unescape Escape View File

@ -157,6 +157,10 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
public DmsBillsLubeInstanceVo updateByBo(DmsBillsLubeInstanceBo bo) { public DmsBillsLubeInstanceVo updateByBo(DmsBillsLubeInstanceBo bo) {
DmsBillsLubeInstance update = MapstructUtils.convert(bo, DmsBillsLubeInstance.class); DmsBillsLubeInstance update = MapstructUtils.convert(bo, DmsBillsLubeInstance.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
boolean flag = baseMapper.updateById(update) > 0;
if (!flag) {
throw new ServiceException("更新润滑工单失败");
}
return MapstructUtils.convert(update, DmsBillsLubeInstanceVo.class); return MapstructUtils.convert(update, DmsBillsLubeInstanceVo.class);
} }

6
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
Unescape Escape View File

@ -159,6 +159,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
public DmsBillsMaintInstanceVo updateByBo(DmsBillsMaintInstanceBo bo) { public DmsBillsMaintInstanceVo updateByBo(DmsBillsMaintInstanceBo bo) {
DmsBillsMaintInstance update = MapstructUtils.convert(bo, DmsBillsMaintInstance.class); DmsBillsMaintInstance update = MapstructUtils.convert(bo, DmsBillsMaintInstance.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
boolean flag = baseMapper.updateById(update) > 0;
if (!flag) {
throw new ServiceException("更新保养工单失败");
}
return MapstructUtils.convert(update, DmsBillsMaintInstanceVo.class); return MapstructUtils.convert(update, DmsBillsMaintInstanceVo.class);
} }
@ -352,7 +356,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
updateWorkFlow(dmsBillsMaintInstance, taskId); updateWorkFlow(dmsBillsMaintInstance, taskId);
} catch (Exception e) { } catch (Exception e) {
// 简单记录错误，不影响主流程 // 简单记录错误，不影响主流程
log.error("异步更新保养工作流失败，getBillsMaintCode: {}, 错误: {}", log.error("异步更新保养工作流失败，getBillsMaintCode: {}, 错误: {}",
dmsBillsMaintInstance.getBillsMaintCode(), e.getMessage(), e); dmsBillsMaintInstance.getBillsMaintCode(), e.getMessage(), e);
// 可以考虑记录到失败表，后续补偿处理 // 可以考虑记录到失败表，后续补偿处理
} }

24
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsRecordInspectServiceImpl.java
Unescape Escape View File

@ -21,7 +21,7 @@ import java.util.Map;
import java.util.Collection; import java.util.Collection;
/** /**
* dmsRecordInspectService业务层处理 * 点巡检历史记录Service业务层处理
* *
* @author zch * @author zch
* @date 2025-06-24 * @date 2025-06-24
@ -33,10 +33,10 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
private final DmsRecordInspectMapper baseMapper; private final DmsRecordInspectMapper baseMapper;
/** /**
* 查询dmsRecordInspect * 查询点巡检历史记录
* *
* @param recordInspectId 主键 * @param recordInspectId 主键
* @return dmsRecordInspect * @return 点巡检历史记录
*/ */
@Override @Override
public DmsRecordInspectVo queryById(Long recordInspectId){ public DmsRecordInspectVo queryById(Long recordInspectId){
@ -44,11 +44,11 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
} }
/** /**
* 分页查询dmsRecordInspect列表 * 分页查询点巡检历史记录列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return dmsRecordInspect分页列表 * @return 点巡检历史记录分页列表
*/ */
@Override @Override
public TableDataInfo<DmsRecordInspectVo> queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery) { public TableDataInfo<DmsRecordInspectVo> queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery) {
@ -58,10 +58,10 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
} }
/** /**
* 查询符合条件的dmsRecordInspect列表 * 查询符合条件的点巡检历史记录列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @return dmsRecordInspect列表 * @return 点巡检历史记录列表
*/ */
@Override @Override
public List<DmsRecordInspectVo> queryList(DmsRecordInspectBo bo) { public List<DmsRecordInspectVo> queryList(DmsRecordInspectBo bo) {
@ -93,9 +93,9 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
} }
/** /**
* 新增dmsRecordInspect * 新增点巡检历史记录
* *
* @param bo dmsRecordInspect * @param bo 点巡检历史记录
* @return 是否新增成功 * @return 是否新增成功
*/ */
@Override @Override
@ -110,9 +110,9 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
} }
/** /**
* 修改dmsRecordInspect * 修改点巡检历史记录
* *
* @param bo dmsRecordInspect * @param bo 点巡检历史记录
* @return 是否修改成功 * @return 是否修改成功
*/ */
@Override @Override
@ -130,7 +130,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
} }
/** /**
* 校验并批量删除dmsRecordInspect信息 * 校验并批量删除点巡检历史记录信息
* *
* @param ids 待删除的主键集合 * @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验 * @param isValid 是否进行有效性校验

Write Preview
Loading…
Cancel
Save