update 机台关联车间和工序
yinq
12 hours ago
parent
539e8c2012
commit
bb9d25322a
@ -0,0 +1,117 @@
|
||||
package org.dromara.mes.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.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo;
|
||||
import org.dromara.mes.service.IProdBaseMachineProcessService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 机台关联工序
|
||||
* 前端访问路由地址为:/mes/baseMachineProcess
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/baseMachineProcess")
|
||||
public class ProdBaseMachineProcessController extends BaseController {
|
||||
|
||||
private final IProdBaseMachineProcessService prodBaseMachineProcessService;
|
||||
|
||||
/**
|
||||
* 查询机台关联工序列表
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdBaseMachineProcessVo> list(ProdBaseMachineProcessBo bo, PageQuery pageQuery) {
|
||||
return prodBaseMachineProcessService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出机台关联工序列表
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:export")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdBaseMachineProcessBo bo, HttpServletResponse response) {
|
||||
List<ProdBaseMachineProcessVo> list = prodBaseMachineProcessService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "机台关联工序", ProdBaseMachineProcessVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取机台关联工序详细信息
|
||||
*
|
||||
* @param machineId 主键
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:query")
|
||||
@GetMapping("/{machineId}")
|
||||
public R<ProdBaseMachineProcessVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long machineId) {
|
||||
return R.ok(prodBaseMachineProcessService.queryById(machineId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增机台关联工序
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:add")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseMachineProcessBo bo) {
|
||||
return toAjax(prodBaseMachineProcessService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改机台关联工序
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:edit")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseMachineProcessBo bo) {
|
||||
return toAjax(prodBaseMachineProcessService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除机台关联工序
|
||||
*
|
||||
* @param machineIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("mes:baseMachineProcess:remove")
|
||||
@Log(title = "机台关联工序", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{machineIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] machineIds) {
|
||||
return toAjax(prodBaseMachineProcessService.deleteWithValidByIds(List.of(machineIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询机台关联工序列表
|
||||
*/
|
||||
|
||||
@GetMapping("/getProdBaseMachineProcessList")
|
||||
public R<List<ProdBaseMachineProcessVo>> getProdBaseMachineProcessList(ProdBaseMachineProcessBo bo) {
|
||||
List<ProdBaseMachineProcessVo> list = prodBaseMachineProcessService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package org.dromara.mes.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 机台关联工序对象 prod_base_machine_process
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Data
|
||||
@TableName("prod_base_machine_process")
|
||||
public class ProdBaseMachineProcess extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
private Long processId;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Long updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Date updateTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package org.dromara.mes.domain.bo;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 机台关联工序业务对象 prod_base_machine_process
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = ProdBaseMachineProcess.class, reverseConvertGenerate = false)
|
||||
public class ProdBaseMachineProcessBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@NotNull(message = "机台ID不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
@NotNull(message = "工序ID不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long processId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package org.dromara.mes.domain.vo;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 机台关联工序视图对象 prod_base_machine_process
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = ProdBaseMachineProcess.class)
|
||||
public class ProdBaseMachineProcessVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 机台ID
|
||||
*/
|
||||
@ExcelProperty(value = "机台ID")
|
||||
private Long machineId;
|
||||
|
||||
/**
|
||||
* 工序ID
|
||||
*/
|
||||
@ExcelProperty(value = "工序ID")
|
||||
private Long processId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.mes.mapper;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 机台关联工序Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
public interface ProdBaseMachineProcessMapper extends BaseMapperPlus<ProdBaseMachineProcess, ProdBaseMachineProcessVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.mes.service;
|
||||
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.mes.domain.bo.ProdBaseMachineProcessBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 机台关联工序Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
public interface IProdBaseMachineProcessService {
|
||||
|
||||
/**
|
||||
* 查询机台关联工序
|
||||
*
|
||||
* @param machineId 主键
|
||||
* @return 机台关联工序
|
||||
*/
|
||||
ProdBaseMachineProcessVo queryById(Long machineId);
|
||||
|
||||
/**
|
||||
* 分页查询机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机台关联工序分页列表
|
||||
*/
|
||||
TableDataInfo<ProdBaseMachineProcessVo> queryPageList(ProdBaseMachineProcessBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机台关联工序列表
|
||||
*/
|
||||
List<ProdBaseMachineProcessVo> queryList(ProdBaseMachineProcessBo bo);
|
||||
|
||||
/**
|
||||
* 新增机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdBaseMachineProcessBo bo);
|
||||
|
||||
/**
|
||||
* 修改机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdBaseMachineProcessBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除机台关联工序信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,133 @@
|
||||
package org.dromara.mes.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.mes.domain.bo.ProdBaseMachineProcessBo;
|
||||
import org.dromara.mes.domain.vo.ProdBaseMachineProcessVo;
|
||||
import org.dromara.mes.domain.ProdBaseMachineProcess;
|
||||
import org.dromara.mes.mapper.ProdBaseMachineProcessMapper;
|
||||
import org.dromara.mes.service.IProdBaseMachineProcessService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 机台关联工序Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-03-04
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdBaseMachineProcessServiceImpl implements IProdBaseMachineProcessService {
|
||||
|
||||
private final ProdBaseMachineProcessMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询机台关联工序
|
||||
*
|
||||
* @param machineId 主键
|
||||
* @return 机台关联工序
|
||||
*/
|
||||
@Override
|
||||
public ProdBaseMachineProcessVo queryById(Long machineId){
|
||||
return baseMapper.selectVoById(machineId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机台关联工序分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdBaseMachineProcessVo> queryPageList(ProdBaseMachineProcessBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdBaseMachineProcess> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdBaseMachineProcessVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的机台关联工序列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 机台关联工序列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdBaseMachineProcessVo> queryList(ProdBaseMachineProcessBo bo) {
|
||||
MPJLambdaWrapper<ProdBaseMachineProcess> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdBaseMachineProcess> buildQueryWrapper(ProdBaseMachineProcessBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdBaseMachineProcess> lqw = JoinWrappers.lambda(ProdBaseMachineProcess.class)
|
||||
.selectAll(ProdBaseMachineProcess.class)
|
||||
.eq(bo.getMachineId() != null, ProdBaseMachineProcess::getMachineId, bo.getMachineId())
|
||||
.eq(bo.getProcessId() != null, ProdBaseMachineProcess::getProcessId, bo.getProcessId())
|
||||
.orderByDesc(ProdBaseMachineProcess::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdBaseMachineProcessBo bo) {
|
||||
ProdBaseMachineProcess add = MapstructUtils.convert(bo, ProdBaseMachineProcess.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setMachineId(add.getMachineId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改机台关联工序
|
||||
*
|
||||
* @param bo 机台关联工序
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdBaseMachineProcessBo bo) {
|
||||
ProdBaseMachineProcess update = MapstructUtils.convert(bo, ProdBaseMachineProcess.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdBaseMachineProcess entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除机台关联工序信息
|
||||
*
|
||||
* @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.mes.mapper.ProdBaseMachineProcessMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue