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

- 在 DmsBillsInspectInstanceServiceImpl、DmsBillsLubeInstanceServiceImpl 和 DmsBillsMaintInstanceServiceImpl 中添加更新失败异常处理
- 将 DmsRecordInspect及相关类的命名从英文改为中文,如 dmsRecordInspect改为 点巡检历史记录
- 更新 DmsRecordInspectController 中的路由地址和权限检查
master
zch 2 days ago
parent 3f65e1fb7e
commit aa3eea7da1

@ -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<DmsRecordInspectVo> 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<DmsRecordInspectVo> 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<DmsRecordInspectVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] recordInspectIds) {
@ -106,7 +106,7 @@ public class DmsRecordInspectController extends BaseController {
/**
* dmsRecordInspect
*
*/
@GetMapping("/getDmsRecordInspectList")

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

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

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

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

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

@ -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);
// 可以考虑记录到失败表,后续补偿处理
}

@ -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<DmsRecordInspectVo> queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery) {
@ -58,10 +58,10 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
}
/**
* dmsRecordInspect
*
*
* @param bo
* @return dmsRecordInspect
* @return
*/
@Override
public List<DmsRecordInspectVo> 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

Loading…
Cancel
Save