feat(dms): 移植mes的设备信息相关接口、实体类和方法
- 新增了机台信息相关的 BO、Controller、Mapper、Service等文件 - 修改了报警详情信息多个文件中的类名和方法名，去除了不必要的分号master
parent
1975dd6199
commit
f21e173a85
@ -0,0 +1,118 @@
|
||||
package org.dromara.dms.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
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.excel.utils.ExcelUtil;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.dms.domain.bo.DmsBaseMachineInfoBo;
|
||||
import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
|
||||
import org.dromara.dms.service.IDmsBaseMachineInfoService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 机台信息
|
||||
* 前端访问路由地址为:/dms/dmsBaseMachineInfo
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-20
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/dmsBaseMachineInfo")
|
||||
public class DmsBaseMachineInfoController extends BaseController {
|
||||
|
||||
private final IDmsBaseMachineInfoService dmsBaseMachineInfoService;
|
||||
|
||||
/**
|
||||
* 查询机台信息列表
|
||||
*/
|
||||
@SaCheckPermission("dms:dmsBaseMachineInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<DmsBaseMachineInfoVo> list(DmsBaseMachineInfoBo bo, PageQuery pageQuery) {
|
||||
return dmsBaseMachineInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出机台信息列表
|
||||
*/
|
||||
@SaCheckPermission("dms:dmsBaseMachineInfo:export")
|
||||
@Log(title = "机台信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(DmsBaseMachineInfoBo bo, HttpServletResponse response) {
|
||||
List<DmsBaseMachineInfoVo> list = dmsBaseMachineInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "机台信息", DmsBaseMachineInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取机台信息详细信息
|
||||
*
|
||||
* @param machineId 主键
|
||||
*/
|
||||
@SaCheckPermission("dms:dmsBaseMachineInfo:query")
|
||||
@GetMapping("/{machineId}")
|
||||
public R<DmsBaseMachineInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long machineId) {
|
||||
return R.ok(dmsBaseMachineInfoService.queryById(machineId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增机台信息
|
||||
*/
|
||||
/* @SaCheckPermission("dms:dmsBaseMachineInfo:add")
|
||||
@Log(title = "机台信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
|
||||
return toAjax(dmsBaseMachineInfoService.insertByBo(bo));
|
||||
}*/
|
||||
|
||||
/**
|
||||
* 修改机台信息
|
||||
*/
|
||||
/* @SaCheckPermission("dms:dmsBaseMachineInfo:edit")
|
||||
@Log(title = "机台信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
|
||||
return toAjax(dmsBaseMachineInfoService.updateByBo(bo));
|
||||
}*/
|
||||
|
||||
/**
|
||||
* 删除机台信息
|
||||
*
|
||||
* @param machineIds 主键串
|
||||
*/
|
||||
/* @SaCheckPermission("dms:dmsBaseMachineInfo:remove")
|
||||
@Log(title = "机台信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{machineIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] machineIds) {
|
||||
return toAjax(dmsBaseMachineInfoService.deleteWithValidByIds(List.of(machineIds), true));
|
||||
}*/
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询机台信息列表
|
||||
*/
|
||||
|
||||
@GetMapping("getDmsBaseMachineInfoList")
|
||||
public R<List<DmsBaseMachineInfoVo>> getDmsBaseMachineInfolist(DmsBaseMachineInfoBo bo) {
|
||||
List<DmsBaseMachineInfoVo> list = dmsBaseMachineInfoService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.dms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.dms.domain.DmsBaseMachineInfo;
|
||||
import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
|
||||
|
||||
/**
|
||||
* 机台信息Mapper接口
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-20
|
||||
*/
|
||||
public interface DmsBaseMachineInfoMapper extends BaseMapperPlus<DmsBaseMachineInfo, DmsBaseMachineInfoVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package org.dromara.dms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.dms.domain.bo.DmsBaseMachineInfoBo;
|
||||
import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 机台信息Service接口
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-20
|
||||
*/
|
||||
public interface IDmsBaseMachineInfoService {
|
||||
|
||||
/**
|
||||
* 查询机台信息
|
||||
*
|
||||
* @param machineId 主键
|
||||
* @return 机台信息
|
||||
*/
|
||||
DmsBaseMachineInfoVo queryById(Long machineId);
|
||||
|
||||
/**
|
||||
* 分页查询机台信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机台信息分页列表
|
||||
*/
|
||||
TableDataInfo<DmsBaseMachineInfoVo> queryPageList(DmsBaseMachineInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的机台信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机台信息列表
|
||||
*/
|
||||
List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo);
|
||||
|
||||
/* *//**
|
||||
* 新增机台信息
|
||||
*
|
||||
* @param bo 机台信息
|
||||
* @return 是否新增成功
|
||||
*//*
|
||||
Boolean insertByBo(DmsBaseMachineInfoBo bo);
|
||||
|
||||
*//**
|
||||
* 修改机台信息
|
||||
*
|
||||
* @param bo 机台信息
|
||||
* @return 是否修改成功
|
||||
*//*
|
||||
Boolean updateByBo(DmsBaseMachineInfoBo bo);
|
||||
|
||||
*//**
|
||||
* 校验并批量删除机台信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*//*
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);*/
|
||||
}
|
||||
@ -0,0 +1,161 @@
|
||||
package org.dromara.dms.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.dms.domain.DmsBaseMachineInfo;
|
||||
import org.dromara.dms.domain.bo.DmsBaseMachineInfoBo;
|
||||
import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
|
||||
import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
|
||||
|
||||
import org.dromara.dms.service.IDmsBaseMachineInfoService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 机台信息Service业务层处理
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-20
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService {
|
||||
|
||||
private final DmsBaseMachineInfoMapper baseMapper;
|
||||
|
||||
|
||||
/**
|
||||
* 查询机台信息
|
||||
*
|
||||
* @param machineId 主键
|
||||
* @return 机台信息
|
||||
*/
|
||||
@Override
|
||||
public DmsBaseMachineInfoVo queryById(Long machineId) {
|
||||
DmsBaseMachineInfoBo bo = new DmsBaseMachineInfoBo();
|
||||
bo.setMachineId(machineId);
|
||||
MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
|
||||
DmsBaseMachineInfoVo prodBaseMachineInfoVo = baseMapper.selectVoOne(lqw);
|
||||
|
||||
return prodBaseMachineInfoVo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询机台信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机台信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<DmsBaseMachineInfoVo> queryPageList(DmsBaseMachineInfoBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<DmsBaseMachineInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的机台信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机台信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo) {
|
||||
MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
|
||||
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<DmsBaseMachineInfo> buildQueryWrapper(DmsBaseMachineInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<DmsBaseMachineInfo> lqw = JoinWrappers.lambda(DmsBaseMachineInfo.class)
|
||||
.selectAll(DmsBaseMachineInfo.class)
|
||||
.eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())
|
||||
.like(StringUtils.isNotBlank(bo.getMachineCode()), DmsBaseMachineInfo::getMachineCode, bo.getMachineCode())
|
||||
.like(StringUtils.isNotBlank(bo.getMachineName()), DmsBaseMachineInfo::getMachineName, bo.getMachineName())
|
||||
.eq(StringUtils.isNotBlank(bo.getMachineLocation()), DmsBaseMachineInfo::getMachineLocation, bo.getMachineLocation())
|
||||
.eq(StringUtils.isNotBlank(bo.getMachineType()), DmsBaseMachineInfo::getMachineType, bo.getMachineType())
|
||||
.eq(StringUtils.isNotBlank(bo.getMachineSpec()), DmsBaseMachineInfo::getMachineSpec, bo.getMachineSpec())
|
||||
.eq(StringUtils.isNotBlank(bo.getSupplierId()), DmsBaseMachineInfo::getSupplierId, bo.getSupplierId())
|
||||
.eq(StringUtils.isNotBlank(bo.getMachineStatus()), DmsBaseMachineInfo::getMachineStatus, bo.getMachineStatus())
|
||||
.eq(StringUtils.isNotNull(bo.getWorkshopId()), DmsBaseMachineInfo::getWorkshopId, bo.getWorkshopId())
|
||||
.orderByAsc(DmsBaseMachineInfo::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/* *//**
|
||||
* 新增机台信息
|
||||
*
|
||||
* @param bo 机台信息
|
||||
* @return 是否新增成功
|
||||
*//*
|
||||
@Override
|
||||
public Boolean insertByBo(DmsBaseMachineInfoBo bo) {
|
||||
DmsBaseMachineInfo add = MapstructUtils.convert(bo, DmsBaseMachineInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setMachineId(add.getMachineId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
*//**
|
||||
* 修改机台信息
|
||||
*
|
||||
* @param bo 机台信息
|
||||
* @return 是否修改成功
|
||||
*//*
|
||||
@Override
|
||||
public Boolean updateByBo(DmsBaseMachineInfoBo bo) {
|
||||
DmsBaseMachineInfo update = MapstructUtils.convert(bo, DmsBaseMachineInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
*//**
|
||||
* 保存前的数据校验
|
||||
*//*
|
||||
private void validEntityBeforeSave(DmsBaseMachineInfo entity) {
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
if (StringUtils.isNotBlank(entity.getMachineCode())) {
|
||||
DmsBaseMachineInfoBo query = new DmsBaseMachineInfoBo();
|
||||
query.setMachineCode(entity.getMachineCode());
|
||||
MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(query);
|
||||
DmsBaseMachineInfo baseDmsBaseMachineInfo = baseMapper.selectOne(lqw);
|
||||
if (baseDmsBaseMachineInfo != null
|
||||
&& !baseDmsBaseMachineInfo.getMachineId().equals(entity.getMachineId())) {
|
||||
throw new ServiceException("编码已存在");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*//**
|
||||
* 校验并批量删除机台信息信息
|
||||
*
|
||||
* @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.DmsBaseMachineInfoMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue