diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/controller/SmartBeamFieldBeamController.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/controller/SmartBeamFieldBeamController.java index 887d750f1..8c0e80992 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/controller/SmartBeamFieldBeamController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/controller/SmartBeamFieldBeamController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -67,7 +68,7 @@ public class SmartBeamFieldBeamController { */ @ApiOperation(value = "添加智慧梁场-梁信息", notes = "添加智慧梁场-梁信息", httpMethod = "POST") @PostMapping(value = "/add") - public Result add(@RequestBody SmartBeamFieldBeam smartBeamFieldBeam) { + public Result add(@RequestBody @Validated SmartBeamFieldBeam smartBeamFieldBeam) { smartBeamFieldBeamService.add(smartBeamFieldBeam); return Result.ok(); } @@ -152,4 +153,10 @@ public class SmartBeamFieldBeamController { return Result.ok(); } + @ApiOperation(value = "开始生产", notes = "开始生产", httpMethod = "POST") + @PostMapping(value = "/beginProduce") + public Result beginProduce(@RequestBody SmartBeamFieldBeam smartBeamFieldBeam) { + smartBeamFieldBeamService.beginProduce(smartBeamFieldBeam); + return Result.ok(); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java index 26d8f12cc..13af7e0cb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java @@ -8,9 +8,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NonNull; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -38,6 +41,7 @@ public class SmartBeamFieldBeam implements Serializable { */ @Excel(name = "智慧梁场-桥段id", width = 15) @ApiModelProperty(value = "智慧梁场-桥段id") + @NotNull private java.lang.Long smartBeamFieldBridgeSectionId; /** * 智慧梁场-生产线id @@ -197,8 +201,10 @@ public class SmartBeamFieldBeam implements Serializable { private java.lang.Integer isSaveBeam; @TableField(exist = false) @ApiModelProperty(value = "梁的二维码页面url") + @NotBlank private java.lang.String beamQrCodeUrl; @TableField(exist = false) @ApiModelProperty(value = "梁和制梁进度的二维码页面url") + @NotBlank private java.lang.String makeBeamProcessQrCodeUrl; } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/SmartBeamFieldBeamMapper.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/SmartBeamFieldBeamMapper.java index 38c4e5354..8ee458972 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/SmartBeamFieldBeamMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/SmartBeamFieldBeamMapper.java @@ -1,17 +1,29 @@ package com.zhgd.xmgl.modules.smartbeamfield.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldBeam; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 智慧梁场-梁 * @author: pds - * @date: 2023-12-05 + * @date: 2023-12-05 * @version: V1.0 */ @Mapper public interface SmartBeamFieldBeamMapper extends BaseMapper { SmartBeamFieldBeam queryById(String id); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml index 6a11f0d8b..61cd5a2e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml @@ -1,12 +1,18 @@ + - + diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java index 44865cd9e..97da1ad9b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java @@ -30,4 +30,6 @@ public interface ISmartBeamFieldBeamService extends IService void bindSaveBeamForBeam(HashMap paramMap); boolean delete(String id); + + void beginProduce(SmartBeamFieldBeam smartBeamFieldBeam); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldBeamServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldBeamServiceImpl.java index a2b9f58fa..2fcb410da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldBeamServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/impl/SmartBeamFieldBeamServiceImpl.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.smartbeamfield.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -57,7 +56,7 @@ public class SmartBeamFieldBeamServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } @@ -65,11 +64,11 @@ public class SmartBeamFieldBeamServiceImpl extends ServiceImpl queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(this.list(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper)); } private QueryWrapper getQueryWrapper(HashMap paramMap) { - String alias = ""; + String alias = "sbfb."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SmartBeamFieldBeam.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SmartBeamFieldBeam::getId)); return queryWrapper; @@ -81,12 +80,6 @@ public class SmartBeamFieldBeamServiceImpl extends ServiceImpl