parent
f0158c5ebe
commit
5cb545b7a5
@ -0,0 +1,95 @@
|
||||
package com.chanko.yunxi.mes.module.heli.controller.admin.procedure;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
import javax.validation.*;
|
||||
import javax.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
|
||||
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
|
||||
import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
|
||||
import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
|
||||
import com.chanko.yunxi.mes.module.heli.service.procedure.ProcedureService;
|
||||
|
||||
@Tag(name = "管理后台 - 工序")
|
||||
@RestController
|
||||
@RequestMapping("/heli/procedure")
|
||||
@Validated
|
||||
public class ProcedureController {
|
||||
|
||||
@Resource
|
||||
private ProcedureService procedureService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建工序")
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:create')")
|
||||
public CommonResult<Long> createProcedure(@Valid @RequestBody ProcedureSaveReqVO createReqVO) {
|
||||
return success(procedureService.createProcedure(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新工序")
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:update')")
|
||||
public CommonResult<Boolean> updateProcedure(@Valid @RequestBody ProcedureSaveReqVO updateReqVO) {
|
||||
procedureService.updateProcedure(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除工序")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:delete')")
|
||||
public CommonResult<Boolean> deleteProcedure(@RequestParam("id") Long id) {
|
||||
procedureService.deleteProcedure(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得工序")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:query')")
|
||||
public CommonResult<ProcedureRespVO> getProcedure(@RequestParam("id") Long id) {
|
||||
ProcedureDO procedure = procedureService.getProcedure(id);
|
||||
return success(BeanUtils.toBean(procedure, ProcedureRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得工序分页")
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:query')")
|
||||
public CommonResult<PageResult<ProcedureRespVO>> getProcedurePage(@Valid ProcedurePageReqVO pageReqVO) {
|
||||
PageResult<ProcedureDO> pageResult = procedureService.getProcedurePage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, ProcedureRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出工序 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('heli:procedure:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportProcedureExcel(@Valid ProcedurePageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<ProcedureDO> list = procedureService.getProcedurePage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "工序.xls", "数据", ProcedureRespVO.class,
|
||||
BeanUtils.toBean(list, ProcedureRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.chanko.yunxi.mes.module.heli.dal.mysql.procedure;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo.*;
|
||||
|
||||
/**
|
||||
* 工序 Mapper
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
@Mapper
|
||||
public interface ProcedureMapper extends BaseMapperX<ProcedureDO> {
|
||||
|
||||
default PageResult<ProcedureDO> selectPage(ProcedurePageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<ProcedureDO>()
|
||||
.likeIfPresent(ProcedureDO::getCode, reqVO.getCode())
|
||||
.likeIfPresent(ProcedureDO::getName, reqVO.getName())
|
||||
.eqIfPresent(ProcedureDO::getDescription, reqVO.getDescription())
|
||||
.eqIfPresent(ProcedureDO::getStatus, reqVO.getStatus())
|
||||
.eqIfPresent(ProcedureDO::getCreator, reqVO.getCreator())
|
||||
.betweenIfPresent(ProcedureDO::getCreateTime, reqVO.getCreateTime())
|
||||
.eqIfPresent(ProcedureDO::getUpdater, reqVO.getUpdater())
|
||||
.betweenIfPresent(ProcedureDO::getUpdateTime, reqVO.getUpdateTime())
|
||||
.eqIfPresent(ProcedureDO::getDeleted, reqVO.getDeleted())
|
||||
.eqIfPresent(ProcedureDO::getTenantId, reqVO.getTenantId())
|
||||
.eqIfPresent(ProcedureDO::getIsReport, reqVO.getIsReport())
|
||||
.eqIfPresent(ProcedureDO::getWid, reqVO.getWid())
|
||||
.orderByDesc(ProcedureDO::getId));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.procedure;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 工序 Service 接口
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
public interface ProcedureService {
|
||||
|
||||
/**
|
||||
* 创建工序
|
||||
*
|
||||
* @param createReqVO 创建信息
|
||||
* @return 编号
|
||||
*/
|
||||
Long createProcedure(@Valid ProcedureSaveReqVO createReqVO);
|
||||
|
||||
/**
|
||||
* 更新工序
|
||||
*
|
||||
* @param updateReqVO 更新信息
|
||||
*/
|
||||
void updateProcedure(@Valid ProcedureSaveReqVO updateReqVO);
|
||||
|
||||
/**
|
||||
* 删除工序
|
||||
*
|
||||
* @param id 编号
|
||||
*/
|
||||
void deleteProcedure(Long id);
|
||||
|
||||
/**
|
||||
* 获得工序
|
||||
*
|
||||
* @param id 编号
|
||||
* @return 工序
|
||||
*/
|
||||
ProcedureDO getProcedure(Long id);
|
||||
|
||||
/**
|
||||
* 获得工序分页
|
||||
*
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 工序分页
|
||||
*/
|
||||
PageResult<ProcedureDO> getProcedurePage(ProcedurePageReqVO pageReqVO);
|
||||
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.procedure;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
|
||||
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.procedure.ProcedureMapper;
|
||||
|
||||
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 工序 Service 实现类
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class ProcedureServiceImpl implements ProcedureService {
|
||||
|
||||
@Resource
|
||||
private ProcedureMapper procedureMapper;
|
||||
|
||||
@Override
|
||||
public Long createProcedure(ProcedureSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
ProcedureDO procedure = BeanUtils.toBean(createReqVO, ProcedureDO.class);
|
||||
procedureMapper.insert(procedure);
|
||||
// 返回
|
||||
return procedure.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateProcedure(ProcedureSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateProcedureExists(updateReqVO.getId());
|
||||
// 更新
|
||||
ProcedureDO updateObj = BeanUtils.toBean(updateReqVO, ProcedureDO.class);
|
||||
procedureMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteProcedure(Long id) {
|
||||
// 校验存在
|
||||
validateProcedureExists(id);
|
||||
// 删除
|
||||
procedureMapper.deleteById(id);
|
||||
}
|
||||
|
||||
private void validateProcedureExists(Long id) {
|
||||
if (procedureMapper.selectById(id) == null) {
|
||||
throw exception(PROCEDURE_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ProcedureDO getProcedure(Long id) {
|
||||
return procedureMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<ProcedureDO> getProcedurePage(ProcedurePageReqVO pageReqVO) {
|
||||
return procedureMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,174 @@
|
||||
package com.chanko.yunxi.mes.module.heli.service.procedure;
|
||||
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.test.core.ut.BaseDbUnitTest;
|
||||
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.procedure.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.procedure.ProcedureMapper;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.hutool.core.util.RandomUtil.*;
|
||||
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
|
||||
import static com.chanko.yunxi.mes.framework.test.core.util.AssertUtils.*;
|
||||
import static com.chanko.yunxi.mes.framework.test.core.util.RandomUtils.*;
|
||||
import static com.chanko.yunxi.mes.framework.common.util.date.LocalDateTimeUtils.*;
|
||||
import static com.chanko.yunxi.mes.framework.common.util.object.ObjectUtils.*;
|
||||
import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
* {@link ProcedureServiceImpl} 的单元测试类
|
||||
*
|
||||
* @author 管理员
|
||||
*/
|
||||
@Import(ProcedureServiceImpl.class)
|
||||
public class ProcedureServiceImplTest extends BaseDbUnitTest {
|
||||
|
||||
@Resource
|
||||
private ProcedureServiceImpl procedureService;
|
||||
|
||||
@Resource
|
||||
private ProcedureMapper procedureMapper;
|
||||
|
||||
@Test
|
||||
public void testCreateProcedure_success() {
|
||||
// 准备参数
|
||||
ProcedureSaveReqVO createReqVO = randomPojo(ProcedureSaveReqVO.class).setId(null);
|
||||
|
||||
// 调用
|
||||
Long procedureId = procedureService.createProcedure(createReqVO);
|
||||
// 断言
|
||||
assertNotNull(procedureId);
|
||||
// 校验记录的属性是否正确
|
||||
ProcedureDO procedure = procedureMapper.selectById(procedureId);
|
||||
assertPojoEquals(createReqVO, procedure, "id");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateProcedure_success() {
|
||||
// mock 数据
|
||||
ProcedureDO dbProcedure = randomPojo(ProcedureDO.class);
|
||||
procedureMapper.insert(dbProcedure);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
ProcedureSaveReqVO updateReqVO = randomPojo(ProcedureSaveReqVO.class, o -> {
|
||||
o.setId(dbProcedure.getId()); // 设置更新的 ID
|
||||
});
|
||||
|
||||
// 调用
|
||||
procedureService.updateProcedure(updateReqVO);
|
||||
// 校验是否更新正确
|
||||
ProcedureDO procedure = procedureMapper.selectById(updateReqVO.getId()); // 获取最新的
|
||||
assertPojoEquals(updateReqVO, procedure);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateProcedure_notExists() {
|
||||
// 准备参数
|
||||
ProcedureSaveReqVO updateReqVO = randomPojo(ProcedureSaveReqVO.class);
|
||||
|
||||
// 调用, 并断言异常
|
||||
assertServiceException(() -> procedureService.updateProcedure(updateReqVO), PROCEDURE_NOT_EXISTS);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteProcedure_success() {
|
||||
// mock 数据
|
||||
ProcedureDO dbProcedure = randomPojo(ProcedureDO.class);
|
||||
procedureMapper.insert(dbProcedure);// @Sql: 先插入出一条存在的数据
|
||||
// 准备参数
|
||||
Long id = dbProcedure.getId();
|
||||
|
||||
// 调用
|
||||
procedureService.deleteProcedure(id);
|
||||
// 校验数据不存在了
|
||||
assertNull(procedureMapper.selectById(id));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDeleteProcedure_notExists() {
|
||||
// 准备参数
|
||||
Long id = randomLongId();
|
||||
|
||||
// 调用, 并断言异常
|
||||
assertServiceException(() -> procedureService.deleteProcedure(id), PROCEDURE_NOT_EXISTS);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
|
||||
public void testGetProcedurePage() {
|
||||
// mock 数据
|
||||
ProcedureDO dbProcedure = randomPojo(ProcedureDO.class, o -> { // 等会查询到
|
||||
o.setCode(null);
|
||||
o.setName(null);
|
||||
o.setDescription(null);
|
||||
o.setStatus(null);
|
||||
o.setCreator(null);
|
||||
o.setCreateTime(null);
|
||||
o.setUpdater(null);
|
||||
o.setUpdateTime(null);
|
||||
o.setDeleted(null);
|
||||
o.setTenantId(null);
|
||||
o.setIsReport(null);
|
||||
o.setWid(null);
|
||||
});
|
||||
procedureMapper.insert(dbProcedure);
|
||||
// 测试 code 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setCode(null)));
|
||||
// 测试 name 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setName(null)));
|
||||
// 测试 description 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setDescription(null)));
|
||||
// 测试 status 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setStatus(null)));
|
||||
// 测试 creator 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setCreator(null)));
|
||||
// 测试 createTime 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setCreateTime(null)));
|
||||
// 测试 updater 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setUpdater(null)));
|
||||
// 测试 updateTime 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setUpdateTime(null)));
|
||||
// 测试 deleted 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setDeleted(null)));
|
||||
// 测试 tenantId 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setTenantId(null)));
|
||||
// 测试 isReport 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setIsReport(null)));
|
||||
// 测试 wid 不匹配
|
||||
procedureMapper.insert(cloneIgnoreId(dbProcedure, o -> o.setWid(null)));
|
||||
// 准备参数
|
||||
ProcedurePageReqVO reqVO = new ProcedurePageReqVO();
|
||||
reqVO.setCode(null);
|
||||
reqVO.setName(null);
|
||||
reqVO.setDescription(null);
|
||||
reqVO.setStatus(null);
|
||||
reqVO.setCreator(null);
|
||||
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
||||
reqVO.setUpdater(null);
|
||||
reqVO.setUpdateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
|
||||
reqVO.setDeleted(null);
|
||||
reqVO.setTenantId(null);
|
||||
reqVO.setIsReport(null);
|
||||
reqVO.setWid(null);
|
||||
|
||||
// 调用
|
||||
PageResult<ProcedureDO> pageResult = procedureService.getProcedurePage(reqVO);
|
||||
// 断言
|
||||
assertEquals(1, pageResult.getTotal());
|
||||
assertEquals(1, pageResult.getList().size());
|
||||
assertPojoEquals(dbProcedure, pageResult.getList().get(0));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
import request from '@/config/axios'
|
||||
|
||||
export interface ProcedureVO {
|
||||
id: number
|
||||
code: string
|
||||
name: string
|
||||
description: string
|
||||
status: number
|
||||
isReport: number
|
||||
wid: number
|
||||
}
|
||||
|
||||
// 查询工序分页
|
||||
export const getProcedurePage = async (params) => {
|
||||
return await request.get({ url: `/heli/procedure/page`, params })
|
||||
}
|
||||
|
||||
// 查询工序详情
|
||||
export const getProcedure = async (id: number) => {
|
||||
return await request.get({ url: `/heli/procedure/get?id=` + id })
|
||||
}
|
||||
|
||||
// 新增工序
|
||||
export const createProcedure = async (data: ProcedureVO) => {
|
||||
return await request.post({ url: `/heli/procedure/create`, data })
|
||||
}
|
||||
|
||||
// 修改工序
|
||||
export const updateProcedure = async (data: ProcedureVO) => {
|
||||
return await request.put({ url: `/heli/procedure/update`, data })
|
||||
}
|
||||
|
||||
// 删除工序
|
||||
export const deleteProcedure = async (id: number) => {
|
||||
return await request.delete({ url: `/heli/procedure/delete?id=` + id })
|
||||
}
|
||||
|
||||
// 导出工序 Excel
|
||||
export const exportProcedure = async (params) => {
|
||||
return await request.download({ url: `/heli/procedure/export-excel`, params })
|
||||
}
|
||||
Loading…
Reference in new issue