feat(dms): 新增巡检记录功能
- 添加 DmsRecordInspect 实体类 - 创建 DmsRecordInspectBo 业务对象类 - 实现 DmsRecordInspectController 控制器 - 编写 DmsRecordInspectMapper Mapper接口 - 开发 DmsRecordInspectServiceImpl 服务实现类 - 设计 DmsRecordInspectVo 视图对象类 -定义 IDmsRecordInspectService服务接口master
parent
df82be7716
commit
3f65e1fb7e
@ -0,0 +1,117 @@
|
||||
package org.dromara.dms.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.dms.domain.vo.DmsRecordInspectVo;
|
||||
import org.dromara.dms.domain.bo.DmsRecordInspectBo;
|
||||
import org.dromara.dms.service.IDmsRecordInspectService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* dmsRecordInspect
|
||||
* 前端访问路由地址为:/dms/recordInspect
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/recordInspect")
|
||||
public class DmsRecordInspectController extends BaseController {
|
||||
|
||||
private final IDmsRecordInspectService dmsRecordInspectService;
|
||||
|
||||
/**
|
||||
* 查询dmsRecordInspect列表
|
||||
*/
|
||||
@SaCheckPermission("dms:recordInspect: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)
|
||||
@PostMapping("/export")
|
||||
public void export(DmsRecordInspectBo bo, HttpServletResponse response) {
|
||||
List<DmsRecordInspectVo> list = dmsRecordInspectService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "dmsRecordInspect", DmsRecordInspectVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取dmsRecordInspect详细信息
|
||||
*
|
||||
* @param recordInspectId 主键
|
||||
*/
|
||||
@SaCheckPermission("dms:recordInspect:query")
|
||||
@GetMapping("/{recordInspectId}")
|
||||
public R<DmsRecordInspectVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long recordInspectId) {
|
||||
return R.ok(dmsRecordInspectService.queryById(recordInspectId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增dmsRecordInspect
|
||||
*/
|
||||
@SaCheckPermission("dms:recordInspect:add")
|
||||
@Log(title = "dmsRecordInspect", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsRecordInspectBo bo) {
|
||||
return toAjax(dmsRecordInspectService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改dmsRecordInspect
|
||||
*/
|
||||
@SaCheckPermission("dms:recordInspect:edit")
|
||||
@Log(title = "dmsRecordInspect", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsRecordInspectBo bo) {
|
||||
return toAjax(dmsRecordInspectService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除dmsRecordInspect
|
||||
*
|
||||
* @param recordInspectIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("dms:recordInspect:remove")
|
||||
@Log(title = "dmsRecordInspect", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{recordInspectIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] recordInspectIds) {
|
||||
return toAjax(dmsRecordInspectService.deleteWithValidByIds(List.of(recordInspectIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询dmsRecordInspect列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getDmsRecordInspectList")
|
||||
public R<List<DmsRecordInspectVo>> getDmsRecordInspectList(DmsRecordInspectBo bo) {
|
||||
List<DmsRecordInspectVo> list = dmsRecordInspectService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.dms.mapper;
|
||||
|
||||
import org.dromara.dms.domain.DmsRecordInspect;
|
||||
import org.dromara.dms.domain.vo.DmsRecordInspectVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* dmsRecordInspectMapper接口
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface DmsRecordInspectMapper extends BaseMapperPlus<DmsRecordInspect, DmsRecordInspectVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.dms.service;
|
||||
|
||||
import org.dromara.dms.domain.DmsRecordInspect;
|
||||
import org.dromara.dms.domain.vo.DmsRecordInspectVo;
|
||||
import org.dromara.dms.domain.bo.DmsRecordInspectBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* dmsRecordInspectService接口
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
public interface IDmsRecordInspectService {
|
||||
|
||||
/**
|
||||
* 查询dmsRecordInspect
|
||||
*
|
||||
* @param recordInspectId 主键
|
||||
* @return dmsRecordInspect
|
||||
*/
|
||||
DmsRecordInspectVo queryById(Long recordInspectId);
|
||||
|
||||
/**
|
||||
* 分页查询dmsRecordInspect列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return dmsRecordInspect分页列表
|
||||
*/
|
||||
TableDataInfo<DmsRecordInspectVo> queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的dmsRecordInspect列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return dmsRecordInspect列表
|
||||
*/
|
||||
List<DmsRecordInspectVo> queryList(DmsRecordInspectBo bo);
|
||||
|
||||
/**
|
||||
* 新增dmsRecordInspect
|
||||
*
|
||||
* @param bo dmsRecordInspect
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(DmsRecordInspectBo bo);
|
||||
|
||||
/**
|
||||
* 修改dmsRecordInspect
|
||||
*
|
||||
* @param bo dmsRecordInspect
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(DmsRecordInspectBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除dmsRecordInspect信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,146 @@
|
||||
package org.dromara.dms.service.impl;
|
||||
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.dms.domain.bo.DmsRecordInspectBo;
|
||||
import org.dromara.dms.domain.vo.DmsRecordInspectVo;
|
||||
import org.dromara.dms.domain.DmsRecordInspect;
|
||||
import org.dromara.dms.mapper.DmsRecordInspectMapper;
|
||||
import org.dromara.dms.service.IDmsRecordInspectService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* dmsRecordInspectService业务层处理
|
||||
*
|
||||
* @author zch
|
||||
* @date 2025-06-24
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService {
|
||||
|
||||
private final DmsRecordInspectMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询dmsRecordInspect
|
||||
*
|
||||
* @param recordInspectId 主键
|
||||
* @return dmsRecordInspect
|
||||
*/
|
||||
@Override
|
||||
public DmsRecordInspectVo queryById(Long recordInspectId){
|
||||
return baseMapper.selectVoById(recordInspectId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询dmsRecordInspect列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return dmsRecordInspect分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<DmsRecordInspectVo> queryPageList(DmsRecordInspectBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<DmsRecordInspect> lqw = buildQueryWrapper(bo);
|
||||
Page<DmsRecordInspectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的dmsRecordInspect列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return dmsRecordInspect列表
|
||||
*/
|
||||
@Override
|
||||
public List<DmsRecordInspectVo> queryList(DmsRecordInspectBo bo) {
|
||||
MPJLambdaWrapper<DmsRecordInspect> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<DmsRecordInspect> buildQueryWrapper(DmsRecordInspectBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<DmsRecordInspect> lqw = JoinWrappers.lambda(DmsRecordInspect.class)
|
||||
.selectAll(DmsRecordInspect.class)
|
||||
.eq(bo.getRecordInspectId() != null, DmsRecordInspect::getRecordInspectId, bo.getRecordInspectId())
|
||||
.eq(bo.getPlanInspectId() != null, DmsRecordInspect::getPlanInspectId, bo.getPlanInspectId())
|
||||
.eq(bo.getInspectInstanceId() != null, DmsRecordInspect::getInspectInstanceId, bo.getInspectInstanceId())
|
||||
.eq(StringUtils.isNotBlank(bo.getBillsInspectCode()), DmsRecordInspect::getBillsInspectCode, bo.getBillsInspectCode())
|
||||
.eq(StringUtils.isNotBlank(bo.getInspectType()), DmsRecordInspect::getInspectType, bo.getInspectType())
|
||||
.eq(bo.getInspectRouteId() != null, DmsRecordInspect::getInspectRouteId, bo.getInspectRouteId())
|
||||
.eq(bo.getDeviceAmount() != null, DmsRecordInspect::getDeviceAmount, bo.getDeviceAmount())
|
||||
.eq(bo.getPlanBeginTime() != null, DmsRecordInspect::getPlanBeginTime, bo.getPlanBeginTime())
|
||||
.eq(bo.getPlanEndTime() != null, DmsRecordInspect::getPlanEndTime, bo.getPlanEndTime())
|
||||
.eq(bo.getRealBeginTime() != null, DmsRecordInspect::getRealBeginTime, bo.getRealBeginTime())
|
||||
.eq(bo.getRealEndTime() != null, DmsRecordInspect::getRealEndTime, bo.getRealEndTime())
|
||||
.eq(StringUtils.isNotBlank(bo.getPerformer()), DmsRecordInspect::getPerformer, bo.getPerformer())
|
||||
.eq(StringUtils.isNotBlank(bo.getInspectStatus()), DmsRecordInspect::getInspectStatus, bo.getInspectStatus())
|
||||
.eq(bo.getInspectDuration() != null, DmsRecordInspect::getInspectDuration, bo.getInspectDuration())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), DmsRecordInspect::getActiveFlag, bo.getActiveFlag())
|
||||
.orderByDesc(DmsRecordInspect::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增dmsRecordInspect
|
||||
*
|
||||
* @param bo dmsRecordInspect
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(DmsRecordInspectBo bo) {
|
||||
DmsRecordInspect add = MapstructUtils.convert(bo, DmsRecordInspect.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setRecordInspectId(add.getRecordInspectId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改dmsRecordInspect
|
||||
*
|
||||
* @param bo dmsRecordInspect
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(DmsRecordInspectBo bo) {
|
||||
DmsRecordInspect update = MapstructUtils.convert(bo, DmsRecordInspect.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(DmsRecordInspect entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除dmsRecordInspect信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.dms.mapper.DmsRecordInspectMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue