Compare commits
3 Commits
a2d5172d1f
...
b96ee62ff9
| Author | SHA1 | Date |
|---|---|---|
HuangHuiKang
|
b96ee62ff9 | 4 weeks ago |
|
HuangHuiKang
|
4bca0543fa | 4 weeks ago |
|
HuangHuiKang
|
7f0a1f8852 | 4 weeks ago |
@ -0,0 +1,98 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordPageReqVO;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordRespVO;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordSaveReqVO;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldPressureNetRecordDO;
|
||||
import cn.iocoder.yudao.module.erp.service.mold.MoldPressureNetRecordService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.Valid;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||
|
||||
@Tag(name = "管理后台 - 子模具压网记录")
|
||||
@RestController
|
||||
@RequestMapping("/erp/mold-pressure-net-record")
|
||||
@Validated
|
||||
public class MoldPressureNetRecordController {
|
||||
|
||||
@Resource
|
||||
private MoldPressureNetRecordService moldPressureNetRecordService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建子模具压网记录")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:create')")
|
||||
public CommonResult<Long> createMoldPressureNetRecord(@Valid @RequestBody MoldPressureNetRecordSaveReqVO createReqVO) {
|
||||
return success(moldPressureNetRecordService.createMoldPressureNetRecord(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新子模具压网记录")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:update')")
|
||||
public CommonResult<Boolean> updateMoldPressureNetRecord(@Valid @RequestBody MoldPressureNetRecordSaveReqVO updateReqVO) {
|
||||
moldPressureNetRecordService.updateMoldPressureNetRecord(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除子模具压网记录")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:delete')")
|
||||
public CommonResult<Boolean> deleteMoldPressureNetRecord(@RequestParam("id") Long id) {
|
||||
moldPressureNetRecordService.deleteMoldPressureNetRecord(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得子模具压网记录")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<MoldPressureNetRecordRespVO> getMoldPressureNetRecord(@RequestParam("id") Long id) {
|
||||
MoldPressureNetRecordDO record = moldPressureNetRecordService.getMoldPressureNetRecord(id);
|
||||
return success(BeanUtils.toBean(record, MoldPressureNetRecordRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得子模具压网记录分页")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
public CommonResult<PageResult<MoldPressureNetRecordRespVO>> getMoldPressureNetRecordPage(@Valid MoldPressureNetRecordPageReqVO pageReqVO) {
|
||||
PageResult<MoldPressureNetRecordDO> pageResult = moldPressureNetRecordService.getMoldPressureNetRecordPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, MoldPressureNetRecordRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出子模具压网记录 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('erp:mold-brand:query')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportMoldPressureNetRecordExcel(@Valid MoldPressureNetRecordPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<MoldPressureNetRecordDO> list = moldPressureNetRecordService.getMoldPressureNetRecordPage(pageReqVO).getList();
|
||||
ExcelUtils.write(response, "子模具压网记录.xls", "数据", MoldPressureNetRecordRespVO.class,
|
||||
BeanUtils.toBean(list, MoldPressureNetRecordRespVO.class));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.mold.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 子模具压网记录分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
public class MoldPressureNetRecordPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "模具组ID", example = "1")
|
||||
private Long moldBrandId;
|
||||
|
||||
@Schema(description = "模具组名称", example = "A组")
|
||||
private String moldBrandName;
|
||||
|
||||
@Schema(description = "子模具ID", example = "1")
|
||||
private Long moldId;
|
||||
|
||||
@Schema(description = "子模具名称", example = "子模具A")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "压网时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] pressureNetTime;
|
||||
|
||||
@Schema(description = "备注", example = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.mold.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 子模具压网记录 Response VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MoldPressureNetRecordRespVO {
|
||||
|
||||
@Schema(description = "ID", example = "1")
|
||||
@ExcelProperty("ID")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "模具组ID", example = "1")
|
||||
@ExcelProperty("模具组ID")
|
||||
private Long moldBrandId;
|
||||
|
||||
@Schema(description = "模具组名称", example = "A组")
|
||||
@ExcelProperty("模具组名称")
|
||||
private String moldBrandName;
|
||||
|
||||
@Schema(description = "子模具ID", example = "1")
|
||||
@ExcelProperty("子模具ID")
|
||||
private Long moldId;
|
||||
|
||||
@Schema(description = "子模具名称", example = "子模具A")
|
||||
@ExcelProperty("子模具名称")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "压网时间")
|
||||
@ExcelProperty("压网时间")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime pressureNetTime;
|
||||
|
||||
@Schema(description = "备注", example = "备注")
|
||||
@ExcelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.iocoder.yudao.module.erp.controller.admin.mold.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
|
||||
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 子模具压网记录新增/修改 Request VO")
|
||||
@Data
|
||||
public class MoldPressureNetRecordSaveReqVO {
|
||||
|
||||
@Schema(description = "ID", example = "1")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "模具组ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotNull(message = "模具组ID不能为空")
|
||||
private Long moldBrandId;
|
||||
|
||||
@Schema(description = "模具组名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "A组")
|
||||
private String moldBrandName;
|
||||
|
||||
@Schema(description = "子模具ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
@NotNull(message = "子模具ID不能为空")
|
||||
private Long moldId;
|
||||
|
||||
@Schema(description = "子模具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "子模具A")
|
||||
private String moldName;
|
||||
|
||||
@Schema(description = "压网时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "压网时间不能为空")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonSerialize(using = LocalDateTimeSerializer.class)
|
||||
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
|
||||
private LocalDateTime pressureNetTime;
|
||||
|
||||
@Schema(description = "备注", example = "备注")
|
||||
private String remark;
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.dataobject.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 子模具压网记录 DO
|
||||
*/
|
||||
@TableName("erp_mold_pressure_net_record")
|
||||
@KeySequence("erp_mold_pressure_net_record_seq")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ToString(callSuper = true)
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class MoldPressureNetRecordDO extends BaseDO {
|
||||
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
private Long moldBrandId;
|
||||
|
||||
private String moldBrandName;
|
||||
|
||||
private Long moldId;
|
||||
|
||||
private String moldName;
|
||||
|
||||
private LocalDateTime pressureNetTime;
|
||||
|
||||
private String remark;
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.iocoder.yudao.module.erp.dal.mysql.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordPageReqVO;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldPressureNetRecordDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface MoldPressureNetRecordMapper extends BaseMapperX<MoldPressureNetRecordDO> {
|
||||
|
||||
default PageResult<MoldPressureNetRecordDO> selectPage(MoldPressureNetRecordPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<MoldPressureNetRecordDO>()
|
||||
.eqIfPresent(MoldPressureNetRecordDO::getMoldBrandId, reqVO.getMoldBrandId())
|
||||
.likeIfPresent(MoldPressureNetRecordDO::getMoldBrandName, reqVO.getMoldBrandName())
|
||||
.eqIfPresent(MoldPressureNetRecordDO::getMoldId, reqVO.getMoldId())
|
||||
.likeIfPresent(MoldPressureNetRecordDO::getMoldName, reqVO.getMoldName())
|
||||
.betweenIfPresent(MoldPressureNetRecordDO::getPressureNetTime, reqVO.getPressureNetTime())
|
||||
.likeIfPresent(MoldPressureNetRecordDO::getRemark, reqVO.getRemark())
|
||||
.betweenIfPresent(MoldPressureNetRecordDO::getCreateTime, reqVO.getCreateTime())
|
||||
.orderByDesc(MoldPressureNetRecordDO::getPressureNetTime)
|
||||
.orderByDesc(MoldPressureNetRecordDO::getId));
|
||||
}
|
||||
|
||||
default List<MoldPressureNetRecordDO> selectListByMoldIds(Collection<Long> moldIds) {
|
||||
if (moldIds == null || moldIds.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return selectLatestListByMoldIds(moldIds);
|
||||
}
|
||||
|
||||
List<MoldPressureNetRecordDO> selectLatestListByMoldIds(@Param("moldIds") Collection<Long> moldIds);
|
||||
|
||||
default List<MoldPressureNetRecordDO> selectListByMoldBrandIds(Collection<Long> moldBrandIds) {
|
||||
return selectList(new LambdaQueryWrapperX<MoldPressureNetRecordDO>()
|
||||
.inIfPresent(MoldPressureNetRecordDO::getMoldBrandId, moldBrandIds)
|
||||
.orderByDesc(MoldPressureNetRecordDO::getPressureNetTime)
|
||||
.orderByDesc(MoldPressureNetRecordDO::getId));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.iocoder.yudao.module.erp.service.mold;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordPageReqVO;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordSaveReqVO;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldPressureNetRecordDO;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
public interface MoldPressureNetRecordService {
|
||||
|
||||
Long createMoldPressureNetRecord(@Valid MoldPressureNetRecordSaveReqVO createReqVO);
|
||||
|
||||
void updateMoldPressureNetRecord(@Valid MoldPressureNetRecordSaveReqVO updateReqVO);
|
||||
|
||||
void deleteMoldPressureNetRecord(Long id);
|
||||
|
||||
MoldPressureNetRecordDO getMoldPressureNetRecord(Long id);
|
||||
|
||||
PageResult<MoldPressureNetRecordDO> getMoldPressureNetRecordPage(MoldPressureNetRecordPageReqVO pageReqVO);
|
||||
|
||||
Map<Long, LocalDateTime> getLatestPressureNetTimeMapByMoldIds(Collection<Long> moldIds);
|
||||
|
||||
Map<Long, LocalDateTime> getLatestPressureNetTimeMapByMoldBrandIds(Collection<Long> moldBrandIds);
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package cn.iocoder.yudao.module.erp.service.mold;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldBrandDO;
|
||||
import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO;
|
||||
import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldBrandMapper;
|
||||
import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordPageReqVO;
|
||||
import cn.iocoder.yudao.module.erp.controller.admin.mold.vo.MoldPressureNetRecordSaveReqVO;
|
||||
import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldPressureNetRecordDO;
|
||||
import cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldPressureNetRecordMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.MOLD_NOT_EXISTS;
|
||||
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.MOLD_PRESSURE_NET_RECORD_NOT_EXISTS;
|
||||
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.MOLD_SET_NOT_EXISTS;
|
||||
|
||||
@Service
|
||||
@Validated
|
||||
public class MoldPressureNetRecordServiceImpl implements MoldPressureNetRecordService {
|
||||
|
||||
@Resource
|
||||
private MoldPressureNetRecordMapper moldPressureNetRecordMapper;
|
||||
@Resource
|
||||
private MoldBrandMapper moldBrandMapper;
|
||||
@Resource
|
||||
private MoldMapper moldMapper;
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Long createMoldPressureNetRecord(MoldPressureNetRecordSaveReqVO createReqVO) {
|
||||
MoldPressureNetRecordDO record = BeanUtils.toBean(createReqVO, MoldPressureNetRecordDO.class);
|
||||
fillMoldInfo(record);
|
||||
moldPressureNetRecordMapper.insert(record);
|
||||
return record.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void updateMoldPressureNetRecord(MoldPressureNetRecordSaveReqVO updateReqVO) {
|
||||
validateMoldPressureNetRecordExists(updateReqVO.getId());
|
||||
MoldPressureNetRecordDO updateObj = BeanUtils.toBean(updateReqVO, MoldPressureNetRecordDO.class);
|
||||
fillMoldInfo(updateObj);
|
||||
moldPressureNetRecordMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void deleteMoldPressureNetRecord(Long id) {
|
||||
validateMoldPressureNetRecordExists(id);
|
||||
moldPressureNetRecordMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MoldPressureNetRecordDO getMoldPressureNetRecord(Long id) {
|
||||
return moldPressureNetRecordMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<MoldPressureNetRecordDO> getMoldPressureNetRecordPage(MoldPressureNetRecordPageReqVO pageReqVO) {
|
||||
return moldPressureNetRecordMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Long, LocalDateTime> getLatestPressureNetTimeMapByMoldIds(Collection<Long> moldIds) {
|
||||
if (CollUtil.isEmpty(moldIds)) {
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
List<MoldPressureNetRecordDO> records = moldPressureNetRecordMapper.selectListByMoldIds(moldIds);
|
||||
return buildLatestTimeMap(records, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<Long, LocalDateTime> getLatestPressureNetTimeMapByMoldBrandIds(Collection<Long> moldBrandIds) {
|
||||
if (CollUtil.isEmpty(moldBrandIds)) {
|
||||
return Collections.emptyMap();
|
||||
}
|
||||
List<MoldPressureNetRecordDO> records = moldPressureNetRecordMapper.selectListByMoldBrandIds(moldBrandIds);
|
||||
return buildLatestTimeMap(records, false);
|
||||
}
|
||||
|
||||
private Map<Long, LocalDateTime> buildLatestTimeMap(List<MoldPressureNetRecordDO> records, boolean byMoldId) {
|
||||
Map<Long, LocalDateTime> result = new LinkedHashMap<>();
|
||||
for (MoldPressureNetRecordDO record : records) {
|
||||
Long key = byMoldId ? record.getMoldId() : record.getMoldBrandId();
|
||||
if (key != null && !result.containsKey(key)) {
|
||||
result.put(key, record.getPressureNetTime());
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void fillMoldInfo(MoldPressureNetRecordDO record) {
|
||||
MoldDO mold = moldMapper.selectById(record.getMoldId());
|
||||
if (mold == null) {
|
||||
throw exception(MOLD_NOT_EXISTS);
|
||||
}
|
||||
Long moldBrandId = mold.getBrandId() != null ? mold.getBrandId() : record.getMoldBrandId();
|
||||
MoldBrandDO moldBrand = moldBrandMapper.selectById(moldBrandId);
|
||||
if (moldBrand == null) {
|
||||
throw exception(MOLD_SET_NOT_EXISTS);
|
||||
}
|
||||
record.setMoldBrandId(moldBrand.getId());
|
||||
record.setMoldBrandName(moldBrand.getName());
|
||||
record.setMoldName(mold.getName());
|
||||
}
|
||||
|
||||
private void validateMoldPressureNetRecordExists(Long id) {
|
||||
if (moldPressureNetRecordMapper.selectById(id) == null) {
|
||||
throw exception(MOLD_PRESSURE_NET_RECORD_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
<?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="cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldPressureNetRecordMapper">
|
||||
|
||||
<select id="selectLatestListByMoldIds" resultType="cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldPressureNetRecordDO">
|
||||
SELECT *
|
||||
FROM erp_mold_pressure_net_record
|
||||
WHERE id IN (
|
||||
SELECT MAX(id)
|
||||
FROM erp_mold_pressure_net_record
|
||||
WHERE deleted = 0
|
||||
and mold_id IN
|
||||
<foreach collection="moldIds" item="moldId" open="(" separator="," close=")">
|
||||
#{moldId}
|
||||
</foreach>
|
||||
GROUP BY mold_id
|
||||
)
|
||||
ORDER BY id DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,49 @@
|
||||
package cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Schema(description = "管理后台 - 模具任务管理直接创建工单 Request VO")
|
||||
@Data
|
||||
public class MoldTaskManagementCreateTicketReqVO {
|
||||
|
||||
@Schema(description = "id", example = "26348")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试任务")
|
||||
@NotBlank(message = "名称不能为空")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "类型(1-点检 2-保养)", example = "2")
|
||||
private Integer taskType;
|
||||
|
||||
@Schema(description = "模具列表", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotBlank(message = "模具列表不能为空")
|
||||
private String moldList;
|
||||
|
||||
@Schema(description = "项目表单", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "项目表单不能为空")
|
||||
private Long projectForm;
|
||||
|
||||
@Schema(description = "起止开始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private String startDate;
|
||||
|
||||
@Schema(description = "起止结束日期", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
// @NotBlank(message = "起止结束日期不能为空")
|
||||
private String endDate;
|
||||
|
||||
@Schema(description = "cron表达式")
|
||||
private String cronExpression;
|
||||
|
||||
@Schema(description = "可操作人")
|
||||
private String operableUsers;
|
||||
|
||||
@Schema(description = "是否启用")
|
||||
private Boolean enabled;
|
||||
}
|
||||
Loading…
Reference in New Issue