From e881336059d39c8f272ea1d1042c348611d75776 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 17 Sep 2024 16:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=85=8D=E7=BD=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectSetController.java | 49 ++++++++++++++ .../api/dao/collect/IoCollectSetMapper.java | 9 +++ .../glxp/api/entity/collect/IoCollectSet.java | 67 +++++++++++++++++++ .../collect/IoCollectOrderBackupService.java | 1 - .../collect/IoCollectOrderService.java | 2 +- .../service/collect/IoCollectSetService.java | 12 ++++ .../mapper/collect/IoCollectSetMapper.xml | 18 +++++ 7 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java create mode 100644 src/main/java/com/glxp/api/dao/collect/IoCollectSetMapper.java create mode 100644 src/main/java/com/glxp/api/entity/collect/IoCollectSet.java create mode 100644 src/main/java/com/glxp/api/service/collect/IoCollectSetService.java create mode 100644 src/main/resources/mybatis/mapper/collect/IoCollectSetMapper.xml diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java new file mode 100644 index 000000000..1c1b4fbba --- /dev/null +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java @@ -0,0 +1,49 @@ +package com.glxp.api.controller.collect; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.entity.collect.IoCollectSet; +import com.glxp.api.req.collect.CollectOrderCodeManRequest; +import com.glxp.api.req.inout.AddTagCodeReqeust; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.collect.CollectOrderCodeManResponse; +import com.glxp.api.service.collect.IoCollectSetService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@Slf4j +@RestController +public class IoCollectSetController extends BaseController { + + @Resource + IoCollectSetService collectSetService; + + + + @GetMapping("/udiwms/ioSplit/collect/getSet") + public BaseResponse getSet() { + List collectSets = collectSetService.list(); + return ResultVOUtils.success(collectSets.get(0)); + } + + + + @PostMapping("/udiwms/ioSplit/collect/updateSet") + public BaseResponse updateSet(@RequestBody @Valid IoCollectSet collectSet) { + collectSetService.updateById(collectSet); + return ResultVOUtils.success("修改成功！"); + } +} diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectSetMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectSetMapper.java new file mode 100644 index 000000000..5445641d4 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectSetMapper.java @@ -0,0 +1,9 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoCollectSet; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface IoCollectSetMapper extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java new file mode 100644 index 000000000..3a93177b5 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java @@ -0,0 +1,67 @@ +package com.glxp.api.entity.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.Date; + +import lombok.Data; + +@ApiModel(value = "io_collect_set") +@Data +@TableName(value = "io_collect_set") +public class IoCollectSet implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "") + private Integer id; + + /** + * 开启下载下时间 + */ + @TableField(value = "startDownloadTime") + @ApiModelProperty(value = "开启下载下时间") + private Date startDownloadTime; + + /** + * 是否开启自动下载 + */ + @TableField(value = "autoDownload") + @ApiModelProperty(value = "是否开启自动下载") + private Boolean autoDownload; + + /** + * 是否自动转成待处理单 + */ + @TableField(value = "autoDealOrder") + @ApiModelProperty(value = "是否自动转成待处理单") + private Boolean autoDealOrder; + + /** + * 是否自动分配单据 + */ + @TableField(value = "autoAllotOrder") + @ApiModelProperty(value = "是否自动分配单据") + private Boolean autoAllotOrder; + + /** + * 是否自动完成单据 + */ + @TableField(value = "autoFinishOrder") + @ApiModelProperty(value = "是否自动完成单据") + private Boolean autoFinishOrder; + + + /** + * 是否自动上传已完成单据 + */ + @TableField(value = "autoUploadOrder") + @ApiModelProperty(value = "是否自动上传已完成单据") + private Boolean autoUploadOrder; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 5f7757fa4..6ffd661c0 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -49,7 +49,6 @@ import java.util.List; @Service public class IoCollectOrderBackupService extends ServiceImpl { - @Resource IoCollectOrderBackupMapper ioCollectOrderBackupMapper; @Resource diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 1a22aabbe..dc2562c95 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -157,7 +157,7 @@ public class IoCollectOrderService extends ServiceImpl { + +} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectSetMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectSetMapper.xml new file mode 100644 index 000000000..40b3aa68c --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoCollectSetMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + id, startDownloadTime, autoDownload, autoDealOrder, autoAllotOrder, autoFinishOrder + + \ No newline at end of file